@webex/plugin-meetings 3.0.0-beta.350 → 3.0.0-beta.351

package/dist/types/constants.d.ts

@@ -441,6 +441,8 @@ export declare const LOCUS: {
         INACTIVE: string;
         ENDED: string;
         INITIALIZING: string;
+        ACTIVE: string;
+        TERMINATING: string;
     };
     SEQUENCE: {
         UN_DEF: string;
@@ -521,7 +523,6 @@ export declare const LOCUSINFO: {
         CONTROLS_MEETING_CONTAINER_UPDATED: string;
         CONTROLS_MEETING_INTERPRETATION_UPDATED: string;
         CONTROLS_ENTRY_EXIT_TONE_UPDATED: string;
-        CONTROLS_JOIN_BREAKOUT_FROM_MAIN: string;
         CONTROLS_MUTE_ON_ENTRY_CHANGED: string;
         CONTROLS_SHARE_CONTROL_CHANGED: string;
         CONTROLS_DISALLOW_UNMUTE_CHANGED: string;

package/dist/types/locus-info/index.d.ts

@@ -292,7 +292,7 @@ export default class LocusInfo extends EventsScope {
     updateLocusCache(locus: any): void;
     /**
      * if return from breakout to main session, need to use cached main session DTO since locus won't send the full locus (participants)
-     * if join breakout from main session, need to query main locus url (if response with 403 means no privilege, need to clear the cache)
+     * if join breakout from main session, main session is not active for the attendee and remove main session locus cache
      * @param {Object} newLocus
      * @returns {Object}
      * @memberof LocusInfo

package/dist/webinar/index.js

@@ -62,7 +62,7 @@ var Webinar = _webexCore.WebexPlugin.extend({
   updateCanManageWebcast: function updateCanManageWebcast(canManageWebcast) {
     this.set('canManageWebcast', canManageWebcast);
   },
-  version: "3.0.0-beta.350"
+  version: "3.0.0-beta.351"
 });
 var _default = Webinar;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "3.0.0-beta.350",
+  "version": "3.0.0-beta.351",
   "description": "",
   "license": "Cisco EULA (https://www.cisco.com/c/en/us/products/end-user-license-agreement.html)",
   "contributors": [
@@ -33,12 +33,12 @@
   },
   "devDependencies": {
     "@peculiar/webcrypto": "^1.4.3",
-    "@webex/plugin-meetings": "3.0.0-beta.350",
-    "@webex/test-helper-chai": "3.0.0-beta.350",
-    "@webex/test-helper-mocha": "3.0.0-beta.350",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.350",
-    "@webex/test-helper-retry": "3.0.0-beta.350",
-    "@webex/test-helper-test-users": "3.0.0-beta.350",
+    "@webex/plugin-meetings": "3.0.0-beta.351",
+    "@webex/test-helper-chai": "3.0.0-beta.351",
+    "@webex/test-helper-mocha": "3.0.0-beta.351",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.351",
+    "@webex/test-helper-retry": "3.0.0-beta.351",
+    "@webex/test-helper-test-users": "3.0.0-beta.351",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "jsdom-global": "3.0.2",
@@ -47,19 +47,19 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "3.0.0-beta.350",
+    "@webex/common": "3.0.0-beta.351",
     "@webex/internal-media-core": "2.2.6",
-    "@webex/internal-plugin-conversation": "3.0.0-beta.350",
-    "@webex/internal-plugin-device": "3.0.0-beta.350",
-    "@webex/internal-plugin-llm": "3.0.0-beta.350",
-    "@webex/internal-plugin-mercury": "3.0.0-beta.350",
-    "@webex/internal-plugin-metrics": "3.0.0-beta.350",
-    "@webex/internal-plugin-support": "3.0.0-beta.350",
-    "@webex/internal-plugin-user": "3.0.0-beta.350",
-    "@webex/media-helpers": "3.0.0-beta.350",
-    "@webex/plugin-people": "3.0.0-beta.350",
-    "@webex/plugin-rooms": "3.0.0-beta.350",
-    "@webex/webex-core": "3.0.0-beta.350",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.351",
+    "@webex/internal-plugin-device": "3.0.0-beta.351",
+    "@webex/internal-plugin-llm": "3.0.0-beta.351",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.351",
+    "@webex/internal-plugin-metrics": "3.0.0-beta.351",
+    "@webex/internal-plugin-support": "3.0.0-beta.351",
+    "@webex/internal-plugin-user": "3.0.0-beta.351",
+    "@webex/media-helpers": "3.0.0-beta.351",
+    "@webex/plugin-people": "3.0.0-beta.351",
+    "@webex/plugin-rooms": "3.0.0-beta.351",
+    "@webex/webex-core": "3.0.0-beta.351",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",

package/src/constants.ts

@@ -580,6 +580,8 @@ export const LOCUS = {
     INACTIVE: 'INACTIVE',
     ENDED: 'ENDED',
     INITIALIZING: 'INITIALIZING',
+    ACTIVE: 'ACTIVE',
+    TERMINATING: 'TERMINATING',
   },
   SEQUENCE: {
     UN_DEF: 'undef',
@@ -663,7 +665,6 @@ export const LOCUSINFO = {
     CONTROLS_MEETING_CONTAINER_UPDATED: 'CONTROLS_MEETING_CONTAINER_UPDATED',
     CONTROLS_MEETING_INTERPRETATION_UPDATED: 'CONTROLS_MEETING_INTERPRETATION_UPDATED',
     CONTROLS_ENTRY_EXIT_TONE_UPDATED: 'CONTROLS_ENTRY_EXIT_TONE_UPDATED',
-    CONTROLS_JOIN_BREAKOUT_FROM_MAIN: 'CONTROLS_JOIN_BREAKOUT_FROM_MAIN',
     CONTROLS_MUTE_ON_ENTRY_CHANGED: 'CONTROLS_MUTE_ON_ENTRY_CHANGED',
     CONTROLS_SHARE_CONTROL_CHANGED: 'CONTROLS_SHARE_CONTROL_CHANGED',
     CONTROLS_DISALLOW_UNMUTE_CHANGED: 'CONTROLS_DISALLOW_UNMUTE_CHANGED',

package/src/locus-info/index.ts

@@ -1604,7 +1604,7 @@ export default class LocusInfo extends EventsScope {
 
   /**
    * if return from breakout to main session, need to use cached main session DTO since locus won't send the full locus (participants)
-   * if join breakout from main session, need to query main locus url (if response with 403 means no privilege, need to clear the cache)
+   * if join breakout from main session, main session is not active for the attendee and remove main session locus cache
    * @param {Object} newLocus
    * @returns {Object}
    * @memberof LocusInfo
@@ -1614,17 +1614,18 @@ export default class LocusInfo extends EventsScope {
     if (switchStatus.isReturnToMain && this.mainSessionLocusCache) {
       return cloneDeep(this.mainSessionLocusCache);
     }
-    if (switchStatus.isJoinToBreakout) {
-      this.emitScoped(
-        {
-          file: 'locus-info',
-          function: 'updateControls',
-        },
-        LOCUSINFO.EVENTS.CONTROLS_JOIN_BREAKOUT_FROM_MAIN,
-        {
-          mainLocusUrl: this.url,
-        }
-      );
+    const isMainSessionDTO =
+      this.mainSessionLocusCache && ControlsUtils.isMainSessionDTO(this.mainSessionLocusCache);
+
+    if (isMainSessionDTO) {
+      const isActive =
+        [LOCUS.STATE.ACTIVE, LOCUS.STATE.INITIALIZING, LOCUS.STATE.TERMINATING].includes(
+          this.fullState?.state
+        ) && !this.mainSessionLocusCache?.self?.removed;
+
+      if (!isActive) {
+        this.clearMainSessionLocusCache();
+      }
     }
 
     return newLocus;

package/src/meeting/index.ts

@@ -2230,16 +2230,6 @@ export default class Meeting extends StatelessWebexPlugin {
       }
     );
 
-    this.locusInfo.on(LOCUSINFO.EVENTS.CONTROLS_JOIN_BREAKOUT_FROM_MAIN, ({mainLocusUrl}) => {
-      this.meetingRequest.getLocusStatusByUrl(mainLocusUrl).catch((error) => {
-        // clear main session cache when attendee join into breakout and forbidden to get locus from main locus url,
-        // which means main session is not active for the attendee
-        if (error?.statusCode === 403) {
-          this.locusInfo.clearMainSessionLocusCache();
-        }
-      });
-    });
-
     this.locusInfo.on(LOCUSINFO.EVENTS.CONTROLS_ENTRY_EXIT_TONE_UPDATED, ({entryExitTone}) => {
       Trigger.trigger(
         this,

package/test/unit/spec/locus-info/index.js

@@ -2058,7 +2058,7 @@ describe('plugin-meetings', () => {
     });
 
     describe('#getTheLocusToUpdate', () => {
-      it('return the cache locus if return to main session', () => {
+      it('return the cache locus if return to main session and do not clear main session cache', () => {
         locusInfo.mainSessionLocusCache = {url: 'url'};
         locusInfo.controls = {
           breakout: {
@@ -2074,9 +2074,13 @@ describe('plugin-meetings', () => {
         };
 
         assert.deepEqual(locusInfo.getTheLocusToUpdate(newLocus), {url: 'url'});
+
+        locusInfo.clearMainSessionLocusCache = sinon.stub();
+        locusInfo.getTheLocusToUpdate(newLocus);
+        assert.notCalled(locusInfo.clearMainSessionLocusCache)
       });
 
-      it('return the new locus if return to main session but no cache', () => {
+      it('return the new locus if return to main session but no cache and do not clear main session cache', () => {
         locusInfo.mainSessionLocusCache = null;
         locusInfo.controls = {
           breakout: {
@@ -2092,10 +2096,22 @@ describe('plugin-meetings', () => {
         };
 
         assert.deepEqual(locusInfo.getTheLocusToUpdate(newLocus), newLocus);
+
+        locusInfo.clearMainSessionLocusCache = sinon.stub();
+        locusInfo.getTheLocusToUpdate(newLocus);
+        assert.notCalled(locusInfo.clearMainSessionLocusCache)
       });
 
-      it('return the new locus if not return to main session', () => {
-        locusInfo.mainSessionLocusCache = {url: 'url'};
+      it('return the new locus if not return to main session and clear main session cache', () => {
+        locusInfo.mainSessionLocusCache = {
+          controls: {
+            breakout: {
+              sessionType: 'MAIN',
+            },
+          },
+          self: {removed: true}
+        };
+        locusInfo.fullState = {state: 'ACTIVE'}
         locusInfo.controls = {
           breakout: {
             sessionType: 'MAIN',
@@ -2109,7 +2125,39 @@ describe('plugin-meetings', () => {
           },
         };
 
-        assert.deepEqual(locusInfo.getTheLocusToUpdate(newLocus), newLocus);
+        locusInfo.clearMainSessionLocusCache = sinon.stub();
+        const result = locusInfo.getTheLocusToUpdate(newLocus);
+        assert.calledOnce(locusInfo.clearMainSessionLocusCache)
+
+        assert.deepEqual(result, newLocus);
+      });
+
+      it('do not clear main session cache when "mainSessionLocusCache?.self?.removed" is not true', () => {
+        locusInfo.mainSessionLocusCache = {
+          controls: {
+            breakout: {
+              sessionType: 'MAIN',
+            },
+          },
+          self: {removed: undefined}
+        };
+        locusInfo.fullState = {state: 'ACTIVE'}
+        locusInfo.controls = {
+          breakout: {
+            sessionType: 'MAIN',
+          },
+        };
+        const newLocus = {
+          controls: {
+            breakout: {
+              sessionType: 'BREAKOUT',
+            },
+          },
+        };
+
+        locusInfo.clearMainSessionLocusCache = sinon.stub();
+        locusInfo.getTheLocusToUpdate(newLocus);
+        assert.notCalled(locusInfo.clearMainSessionLocusCache)
       });
     });
 

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

@@ -6994,41 +6994,6 @@ describe('plugin-meetings', () => {
           );
         });
 
-        it('listens to the timing that user joined into breakout', async () => {
-          const mainLocusUrl = 'mainLocusUrl123';
-
-          meeting.meetingRequest.getLocusStatusByUrl = sinon.stub().returns(Promise.resolve());
-
-          await meeting.locusInfo.emit(
-            {function: 'test', file: 'test'},
-            'CONTROLS_JOIN_BREAKOUT_FROM_MAIN',
-            {mainLocusUrl}
-          );
-
-          assert.calledOnceWithExactly(meeting.meetingRequest.getLocusStatusByUrl, mainLocusUrl);
-          const error = {statusCode: 403};
-          meeting.meetingRequest.getLocusStatusByUrl.rejects(error);
-          meeting.locusInfo.clearMainSessionLocusCache = sinon.stub();
-          await meeting.locusInfo.emit(
-            {function: 'test', file: 'test'},
-            'CONTROLS_JOIN_BREAKOUT_FROM_MAIN',
-            {mainLocusUrl}
-          );
-
-          assert.calledOnce(meeting.locusInfo.clearMainSessionLocusCache);
-
-          const otherError = new Error('something wrong');
-          meeting.meetingRequest.getLocusStatusByUrl.rejects(otherError);
-          meeting.locusInfo.clearMainSessionLocusCache = sinon.stub();
-          await meeting.locusInfo.emit(
-            {function: 'test', file: 'test'},
-            'CONTROLS_JOIN_BREAKOUT_FROM_MAIN',
-            {mainLocusUrl}
-          );
-
-          assert.notCalled(meeting.locusInfo.clearMainSessionLocusCache);
-        });
-
         it('listens to the locus interpretation update event', () => {
           const interpretation = {
             siLanguages: [{languageCode: 20, languageName: 'en'}],