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

package/dist/types/meeting/index.d.ts

@@ -38,7 +38,7 @@ export type AddMediaOptions = {
 };
 export declare const MEDIA_UPDATE_TYPE: {
     TRANSCODED_MEDIA_CONNECTION: string;
-    LAMBDA: string;
+    SHARE_FLOOR_REQUEST: string;
     UPDATE_MEDIA: string;
 };
 /**
@@ -391,6 +391,13 @@ export default class Meeting extends StatelessWebexPlugin {
      * @memberof Meeting
      */
     constructor(attrs: any, options: object);
+    /**
+     * returns meeting is joined
+     * @private
+     * @memberof Meeting
+     * @returns {Boolean}
+     */
+    private isJoined;
     /**
      * Fetches meeting information.
      * @param {Object} options

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "3.0.0-beta.158",
+  "version": "3.0.0-beta.159",
   "description": "",
   "license": "Cisco EULA (https://www.cisco.com/c/en/us/products/end-user-license-agreement.html)",
   "contributors": [
@@ -32,12 +32,12 @@
     "build": "yarn run -T tsc --declaration true --declarationDir ./dist/types"
   },
   "devDependencies": {
-    "@webex/plugin-meetings": "3.0.0-beta.158",
-    "@webex/test-helper-chai": "3.0.0-beta.158",
-    "@webex/test-helper-mocha": "3.0.0-beta.158",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.158",
-    "@webex/test-helper-retry": "3.0.0-beta.158",
-    "@webex/test-helper-test-users": "3.0.0-beta.158",
+    "@webex/plugin-meetings": "3.0.0-beta.159",
+    "@webex/test-helper-chai": "3.0.0-beta.159",
+    "@webex/test-helper-mocha": "3.0.0-beta.159",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.159",
+    "@webex/test-helper-retry": "3.0.0-beta.159",
+    "@webex/test-helper-test-users": "3.0.0-beta.159",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "jsdom-global": "3.0.2",
@@ -46,19 +46,19 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "3.0.0-beta.158",
+    "@webex/common": "3.0.0-beta.159",
     "@webex/internal-media-core": "1.38.6",
-    "@webex/internal-plugin-conversation": "3.0.0-beta.158",
-    "@webex/internal-plugin-device": "3.0.0-beta.158",
-    "@webex/internal-plugin-llm": "3.0.0-beta.158",
-    "@webex/internal-plugin-mercury": "3.0.0-beta.158",
-    "@webex/internal-plugin-metrics": "3.0.0-beta.158",
-    "@webex/internal-plugin-support": "3.0.0-beta.158",
-    "@webex/internal-plugin-user": "3.0.0-beta.158",
-    "@webex/media-helpers": "3.0.0-beta.158",
-    "@webex/plugin-people": "3.0.0-beta.158",
-    "@webex/plugin-rooms": "3.0.0-beta.158",
-    "@webex/webex-core": "3.0.0-beta.158",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.159",
+    "@webex/internal-plugin-device": "3.0.0-beta.159",
+    "@webex/internal-plugin-llm": "3.0.0-beta.159",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.159",
+    "@webex/internal-plugin-metrics": "3.0.0-beta.159",
+    "@webex/internal-plugin-support": "3.0.0-beta.159",
+    "@webex/internal-plugin-user": "3.0.0-beta.159",
+    "@webex/media-helpers": "3.0.0-beta.159",
+    "@webex/plugin-people": "3.0.0-beta.159",
+    "@webex/plugin-rooms": "3.0.0-beta.159",
+    "@webex/webex-core": "3.0.0-beta.159",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",

package/src/breakouts/index.ts

@@ -334,7 +334,7 @@ const Breakouts = WebexPlugin.extend({
       url: params.url,
       [BREAKOUTS.SESSION_STATES.ACTIVE]: false,
       [BREAKOUTS.SESSION_STATES.ALLOWED]: false,
-      [BREAKOUTS.SESSION_STATES.ALLOWED]: false,
+      [BREAKOUTS.SESSION_STATES.ASSIGNED]: false,
       [BREAKOUTS.SESSION_STATES.ASSIGNED_CURRENT]: false,
       [BREAKOUTS.SESSION_STATES.REQUESTED]: false,
     });

package/src/meeting/index.ts

@@ -160,7 +160,7 @@ export type AddMediaOptions = {
 
 export const MEDIA_UPDATE_TYPE = {
   TRANSCODED_MEDIA_CONNECTION: 'TRANSCODED_MEDIA_CONNECTION',
-  LAMBDA: 'LAMBDA',
+  SHARE_FLOOR_REQUEST: 'SHARE_FLOOR_REQUEST',
   UPDATE_MEDIA: 'UPDATE_MEDIA',
 };
 
@@ -1213,6 +1213,16 @@ export default class Meeting extends StatelessWebexPlugin {
     };
   }
 
+  /**
+   * returns meeting is joined
+   * @private
+   * @memberof Meeting
+   * @returns {Boolean}
+   */
+  private isJoined() {
+    return this.joinedWith?.state === 'JOINED';
+  }
+
   /**
    * Fetches meeting information.
    * @param {Object} options
@@ -1502,14 +1512,16 @@ export default class Meeting extends StatelessWebexPlugin {
     });
 
     this.breakouts.on(BREAKOUTS.EVENTS.ASK_RETURN_TO_MAIN, () => {
-      Trigger.trigger(
-        this,
-        {
-          file: 'meeting/index',
-          function: 'setUpBreakoutsListener',
-        },
-        EVENT_TRIGGERS.MEETING_BREAKOUTS_ASK_RETURN_TO_MAIN
-      );
+      if (this.isJoined()) {
+        Trigger.trigger(
+          this,
+          {
+            file: 'meeting/index',
+            function: 'setUpBreakoutsListener',
+          },
+          EVENT_TRIGGERS.MEETING_BREAKOUTS_ASK_RETURN_TO_MAIN
+        );
+      }
     });
 
     this.breakouts.on(BREAKOUTS.EVENTS.LEAVE_BREAKOUT, () => {
@@ -4178,7 +4190,7 @@ export default class Meeting extends StatelessWebexPlugin {
     // @ts-ignore - Fix type
     const {url, info: {datachannelUrl} = {}} = this.locusInfo;
 
-    const isJoined = this.joinedWith && this.joinedWith.state === 'JOINED';
+    const isJoined = this.isJoined();
 
     // @ts-ignore - Fix type
     if (this.webex.internal.llm.isConnected()) {
@@ -5196,11 +5208,7 @@ export default class Meeting extends StatelessWebexPlugin {
       )
       .then(() => {
         if (localTracks?.screenShare?.video) {
-          this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.LAMBDA, {
-            lambda: async () => {
-              return this.requestScreenShareFloor();
-            },
-          });
+          this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.SHARE_FLOOR_REQUEST);
         }
       })
       .then(() => this.mediaProperties.getCurrentConnectionType())
@@ -5296,12 +5304,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  private enqueueMediaUpdate(mediaUpdateType: string, options: any): Promise<void> {
-    if (mediaUpdateType === MEDIA_UPDATE_TYPE.LAMBDA && typeof options?.lambda !== 'function') {
-      return Promise.reject(
-        new Error('lambda must be specified when enqueuing MEDIA_UPDATE_TYPE.LAMBDA')
-      );
-    }
+  private enqueueMediaUpdate(mediaUpdateType: string, options: any = {}): Promise<void> {
     const canUpdateMediaNow = this.canUpdateMedia();
 
     return new Promise((resolve, reject) => {
@@ -5365,8 +5368,8 @@ export default class Meeting extends StatelessWebexPlugin {
         case MEDIA_UPDATE_TYPE.TRANSCODED_MEDIA_CONNECTION:
           mediaUpdate = this.updateTranscodedMediaConnection();
           break;
-        case MEDIA_UPDATE_TYPE.LAMBDA:
-          mediaUpdate = options.lambda();
+        case MEDIA_UPDATE_TYPE.SHARE_FLOOR_REQUEST:
+          mediaUpdate = this.requestScreenShareFloor();
           break;
         case MEDIA_UPDATE_TYPE.UPDATE_MEDIA:
           mediaUpdate = this.updateMedia(options);
@@ -6641,7 +6644,7 @@ export default class Meeting extends StatelessWebexPlugin {
     LoggerProxy.logger.info(`${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
@@ -6770,11 +6773,7 @@ export default class Meeting extends StatelessWebexPlugin {
       // we're sending the http request to Locus to request the screen share floor
       // only after the SDP update, because that's how it's always been done for transcoded meetings
       // and also if sharing from the start, we need confluence to have been created
-      await this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.LAMBDA, {
-        lambda: async () => {
-          return this.requestScreenShareFloor();
-        },
-      });
+      await this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.SHARE_FLOOR_REQUEST);
     }
   }
 

package/test/unit/spec/meeting/index.js

@@ -2710,6 +2710,19 @@ describe('plugin-meetings', () => {
         });
       });
 
+      describe("#isJoined", () => {
+        it("should returns isJoined correctly", () => {
+          meeting.joinedWith = undefined;
+          assert.equal(meeting.isJoined(), false);
+
+          meeting.joinedWith = {state: "NOT_JOINED"};
+          assert.equal(meeting.isJoined(), false);
+          
+          meeting.joinedWith = {state: "JOINED"};
+          assert.equal(meeting.isJoined(), true);
+        });
+      });
+
       describe('#fetchMeetingInfo', () => {
         const FAKE_DESTINATION = 'something@somecompany.com';
         const FAKE_TYPE = _SIP_URI_;
@@ -4463,8 +4476,16 @@ describe('plugin-meetings', () => {
           );
         });
 
+        it('should not trigger ASK_RETURN_TO_MAIN before joined', () => {
+          TriggerProxy.trigger.reset();
+          meeting.joinedWith = {state: "NOT_JOINED"};
+          meeting.breakouts.trigger('ASK_RETURN_TO_MAIN');
+          assert.notCalled(TriggerProxy.trigger);
+        });
+
         it('listens to the ask return to main event from breakouts and triggers the ask return to main event from meeting', () => {
           TriggerProxy.trigger.reset();
+          meeting.joinedWith = {state: "JOINED"};
           meeting.breakouts.trigger('ASK_RETURN_TO_MAIN');
           assert.calledWith(
             TriggerProxy.trigger,