@webex/plugin-meetings 3.8.1-next.8 → 3.8.1

package/src/meeting/index.ts

@@ -263,9 +263,8 @@ type FetchMeetingInfoParams = {
 };
 
 type MediaReachabilityMetrics = ReachabilityMetrics & {
-  subnet_reachable: boolean;
-  selected_cluster: string | null;
-  selected_subnet: string | null;
+  isSubnetReachable: boolean;
+  selectedCluster: string | null;
 };
 
 /**
@@ -1345,7 +1344,7 @@ export default class Meeting extends StatelessWebexPlugin {
       captions: [],
       isListening: false,
       commandText: '',
-      languageOptions: {currentSpokenLanguage: 'en'},
+      languageOptions: {},
       showCaptionBox: false,
       transcribingRequestStatus: 'INACTIVE',
       isCaptioning: false,
@@ -2754,27 +2753,6 @@ export default class Meeting extends StatelessWebexPlugin {
       }
     );
 
-    this.locusInfo.on(
-      LOCUSINFO.EVENTS.CONTROLS_MEETING_TRANSCRIPTION_SPOKEN_LANGUAGE_UPDATED,
-      ({spokenLanguage}) => {
-        if (spokenLanguage) {
-          this.transcription.languageOptions.currentSpokenLanguage = spokenLanguage;
-          // @ts-ignore
-          this.webex.internal.voicea.onSpokenLanguageUpdate(spokenLanguage);
-
-          Trigger.trigger(
-            this,
-            {
-              file: 'meeting/index',
-              function: 'setupLocusControlsListener',
-            },
-            EVENT_TRIGGERS.MEETING_TRANSCRIPTION_SPOKEN_LANGUAGE_UPDATED,
-            {spokenLanguage}
-          );
-        }
-      }
-    );
-
     this.locusInfo.on(LOCUSINFO.EVENTS.CONTROLS_MEETING_MANUAL_CAPTION_UPDATED, ({enable}) => {
       Trigger.trigger(
         this,
@@ -2943,15 +2921,6 @@ export default class Meeting extends StatelessWebexPlugin {
         {state}
       );
     });
-
-    this.locusInfo.on(LOCUSINFO.EVENTS.CONTROLS_POLLING_QA_CHANGED, ({state}) => {
-      Trigger.trigger(
-        this,
-        {file: 'meeting/index', function: 'setupLocusControlsListener'},
-        EVENT_TRIGGERS.MEETING_CONTROLS_POLLING_QA_UPDATED,
-        {state}
-      );
-    });
   }
 
   /**
@@ -3917,16 +3886,13 @@ export default class Meeting extends StatelessWebexPlugin {
       return Promise.reject(error);
     }
 
-    return this.brbState
-      .enable(enabled, this.sendSlotManager)
-      .then(() => {
-        if (this.audio && enabled) {
-          // locus mutes the participant with brb enabled request,
-          // so we need to explicitly update remote mute for correct logic flow
-          this.audio.handleServerRemoteMuteUpdate(this, enabled);
-        }
-      })
-      .catch((error) => Promise.reject(error));
+    return this.brbState.enable(enabled, this.sendSlotManager).then(() => {
+      if (this.audio && enabled) {
+        // locus mutes the participant with brb enabled request,
+        // so we need to explicitly update remote mute for correct logic flow
+        this.audio.handleServerRemoteMuteUpdate(this, enabled);
+      }
+    });
   }
 
   /**
@@ -4393,14 +4359,6 @@ export default class Meeting extends StatelessWebexPlugin {
             requiredHints: [DISPLAY_HINTS.DISABLE_RDC_MEETING_OPTION],
             displayHints: this.userDisplayHints,
           }),
-          canEnablePollingQA: ControlsOptionsUtil.hasHints({
-            requiredHints: [DISPLAY_HINTS.ENABLE_ATTENDEE_START_POLLING_QA],
-            displayHints: this.userDisplayHints,
-          }),
-          canDisablePollingQA: ControlsOptionsUtil.hasHints({
-            requiredHints: [DISPLAY_HINTS.DISABLE_ATTENDEE_START_POLLING_QA],
-            displayHints: this.userDisplayHints,
-          }),
         }) || changed;
     }
     if (changed) {
@@ -4916,6 +4874,11 @@ export default class Meeting extends StatelessWebexPlugin {
 
       // Only send restore event when it was disconnected before and for connected later
       if (!this.hasWebsocketConnected) {
+        // @ts-ignore
+        this.webex.internal.newMetrics.submitClientEvent({
+          name: 'client.mercury.connection.restored',
+          options: {meetingId: this.id},
+        });
         Metrics.sendBehavioralMetric(BEHAVIORAL_METRICS.MERCURY_CONNECTION_RESTORED, {
           correlation_id: this.correlationId,
         });
@@ -4926,6 +4889,11 @@ export default class Meeting extends StatelessWebexPlugin {
     // @ts-ignore
     this.webex.internal.mercury.on(OFFLINE, () => {
       LoggerProxy.logger.error('Meeting:index#setMercuryListener --> Web socket offline');
+      // @ts-ignore
+      this.webex.internal.newMetrics.submitClientEvent({
+        name: 'client.mercury.connection.lost',
+        options: {meetingId: this.id},
+      });
       Metrics.sendBehavioralMetric(BEHAVIORAL_METRICS.MERCURY_CONNECTION_FAILURE, {
         correlation_id: this.correlationId,
       });
@@ -9722,22 +9690,21 @@ export default class Meeting extends StatelessWebexPlugin {
       return total;
     }, 0);
 
-    const selectedSubnetFirstOctet = this.mediaServerIp?.split('.')[0];
-
     let isSubnetReachable = null;
-    if (totalSuccessCases > 0 && selectedSubnetFirstOctet) {
-      isSubnetReachable =
-        // @ts-ignore
-        this.webex.meetings.reachability.isSubnetReachable(selectedSubnetFirstOctet);
+    if (totalSuccessCases > 0) {
+      // @ts-ignore
+      isSubnetReachable = this.webex.meetings.reachability.isSubnetReachable(this.mediaServerIp);
     }
 
-    const selectedCluster = this.mediaConnections?.[0]?.mediaAgentCluster ?? null;
+    let selectedCluster = null;
+    if (this.mediaConnections && this.mediaConnections.length > 0) {
+      selectedCluster = this.mediaConnections[0].mediaAgentCluster;
+    }
 
     return {
       ...reachabilityMetrics,
-      subnet_reachable: isSubnetReachable,
-      selected_cluster: selectedCluster,
-      selected_subnet: selectedSubnetFirstOctet ? `${selectedSubnetFirstOctet}.X.X.X` : null,
+      isSubnetReachable,
+      selectedCluster,
     };
   }
 }

package/src/metrics/constants.ts

@@ -72,7 +72,6 @@ const BEHAVIORAL_METRICS = {
   MEETING_INFO_POLICY_ERROR: 'js_sdk_meeting_info_policy_error',
   LOCUS_DELTA_SYNC_FAILED: 'js_sdk_locus_delta_sync_failed',
   LOCUS_DELTA_OUT_OF_ORDER: 'js_sdk_locus_delta_ooo',
-  LOCUS_SYNC_HANDLING_FAILED: 'js_sdk_locus_sync_handling_failed',
   PERMISSION_TOKEN_REFRESH: 'js_sdk_permission_token_refresh',
   PERMISSION_TOKEN_REFRESH_ERROR: 'js_sdk_permission_token_refresh_error',
   TURN_DISCOVERY_LATENCY: 'js_sdk_turn_discovery_latency',

package/src/reachability/index.ts

@@ -140,14 +140,22 @@ export default class Reachability extends EventsScope {
 
   /**
    * Checks if the given subnet is reachable
-   * @param {string} selectedSubnetFirstOctet - selected subnet first octet, e.g. "10" for "10.X.X.X"
+   * @param {string} mediaServerIp - media server ip
    * @returns {boolean | null} true if reachable, false if not reachable, null if mediaServerIp is not provided
    * @public
    * @memberof Reachability
    */
-  public isSubnetReachable(selectedSubnetFirstOctet: string): boolean | null {
+  public isSubnetReachable(mediaServerIp?: string): boolean | null {
+    if (!mediaServerIp) {
+      LoggerProxy.logger.error(`Reachability:index#isSubnetReachable --> mediaServerIp is null`);
+
+      return null;
+    }
+
+    const subnetFirstOctet = mediaServerIp.split('.')[0];
+
     LoggerProxy.logger.info(
-      `Reachability:index#isSubnetReachable --> Looking for subnet: ${selectedSubnetFirstOctet}.X.X.X`
+      `Reachability:index#isSubnetReachable --> Looking for subnet: ${subnetFirstOctet}.X.X.X`
     );
 
     const matchingReachedClusters = Object.values(this.clusterReachability).reduce(
@@ -159,7 +167,7 @@ export default class Reachability extends EventsScope {
           const subnet = reachedSubnetsArray[i];
           const reachedSubnetFirstOctet = subnet.split('.')[0];
 
-          if (selectedSubnetFirstOctet === reachedSubnetFirstOctet) {
+          if (subnetFirstOctet === reachedSubnetFirstOctet) {
             acc.add(cluster.name);
           }
 
@@ -178,7 +186,7 @@ export default class Reachability extends EventsScope {
     );
 
     LoggerProxy.logger.info(
-      `Reachability:index#isSubnetReachable --> Found ${matchingReachedClusters.size} clusters that use the subnet ${selectedSubnetFirstOctet}.X.X.X`
+      `Reachability:index#isSubnetReachable --> Found ${matchingReachedClusters.size} clusters that use the subnet ${subnetFirstOctet}.X.X.X`
     );
 
     return matchingReachedClusters.size > 0;

package/test/unit/spec/controls-options-manager/util.js

@@ -473,40 +473,6 @@ describe('plugin-meetings', () => {
           assert.equal(results, expected);
         });
       });
-      
-      describe('canUpdatePollingQA()', () => {
-        beforeEach(() => {
-          sinon.stub(ControlsOptionsUtil, 'hasHints').returns(true);
-        });
-
-        it('should call hasHints() with proper hints when `enabled` is true', () => {
-          ControlsOptionsUtil.canUpdatePollingQA({properties: {enabled: true}}, []);
-
-          assert.calledWith(ControlsOptionsUtil.hasHints, {
-            requiredHints: [DISPLAY_HINTS.ENABLE_ATTENDEE_START_POLLING_QA],
-            displayHints: [],
-          });
-        });
-
-        it('should call hasHints() with proper hints when `enabled` is false', () => {
-          ControlsOptionsUtil.canUpdatePollingQA({properties: {enabled: false}}, []);
-
-          assert.calledWith(ControlsOptionsUtil.hasHints, {
-            requiredHints: [DISPLAY_HINTS.DISABLE_ATTENDEE_START_POLLING_QA],
-            displayHints: [],
-          });
-        });
-
-        it('should return the resolution of hasHints()', () => {
-          const expected = 'example-return-value';
-          ControlsOptionsUtil.hasHints.returns(expected);
-
-          const results = ControlsOptionsUtil.canUpdatePollingQA({properties: {}}, []);
-
-          assert.calledOnce(ControlsOptionsUtil.hasHints);
-          assert.equal(results, expected);
-        });
-      });
 
       describe('canUpdate()', () => {
         const displayHints = [];
@@ -520,7 +486,6 @@ describe('plugin-meetings', () => {
           ControlsOptionsUtil.canUpdateViewTheParticipantsList = sinon.stub().returns(true);
           ControlsOptionsUtil.canUpdateAnnotation = sinon.stub().returns(true);
           ControlsOptionsUtil.canUpdateRemoteDesktopControl = sinon.stub().returns(true);
-          ControlsOptionsUtil.canUpdatePollingQA = sinon.stub().returns(true);
         });
 
         it('should only call canUpdateAudio() if the scope is audio', () => {
@@ -656,28 +621,6 @@ describe('plugin-meetings', () => {
             control,
             displayHints
           );
-          assert.callCount(ControlsOptionsUtil.canUpdatePollingQA, 0);
-          assert.isTrue(results);
-        });
-
-        it('should only call canUpdatePollingQA() if the scope is pollingQA', () => {
-          const control = {scope: 'pollingQA'};
-
-          const results = ControlsOptionsUtil.canUpdate(control, displayHints);
-
-          assert.callCount(ControlsOptionsUtil.canUpdateAudio, 0);
-          assert.callCount(ControlsOptionsUtil.canUpdateRaiseHand, 0);
-          assert.callCount(ControlsOptionsUtil.canUpdateReactions, 0);
-          assert.callCount(ControlsOptionsUtil.canUpdateShareControl, 0);
-          assert.callCount(ControlsOptionsUtil.canUpdateVideo, 0);
-          assert.callCount(ControlsOptionsUtil.canUpdateViewTheParticipantsList, 0);
-          assert.callCount(ControlsOptionsUtil.canUpdateAnnotation, 0);
-          assert.callCount(ControlsOptionsUtil.canUpdateRemoteDesktopControl, 0);
-          assert.calledWith(
-            ControlsOptionsUtil.canUpdatePollingQA,
-            control,
-            displayHints
-          );
           assert.isTrue(results);
         });
 
@@ -694,7 +637,6 @@ describe('plugin-meetings', () => {
           assert.callCount(ControlsOptionsUtil.canUpdateViewTheParticipantsList, 0);
           assert.callCount(ControlsOptionsUtil.canUpdateAnnotation, 0);
           assert.callCount(ControlsOptionsUtil.canUpdateRemoteDesktopControl, 0);
-          assert.callCount(ControlsOptionsUtil.canUpdatePollingQA, 0);
           assert.isFalse(results);
         });
       });

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

@@ -164,14 +164,6 @@ describe('plugin-meetings', () => {
 
         assert.equal(parsedControls.rdcControl.enabled, newControls.rdcControl.enabled);
       });
-      
-      it('should parse the pollingQAControl control', () => {
-        const newControls = {pollingQAControl: {enabled: true}};
-
-        const parsedControls = ControlsUtils.parse(newControls);
-
-        assert.equal(parsedControls.pollingQAControl.enabled, newControls.pollingQAControl.enabled);
-      });
 
       describe('videoEnabled', () => {
         it('returns expected', () => {
@@ -419,50 +411,6 @@ describe('plugin-meetings', () => {
         assert.equal(updates.hasRemoteDesktopControlChanged, true);
       });
 
-      it('returns hasPollingQAControlChanged = true when changed', () => {
-        const newControls = {pollingQAControl: {enabled: true}};
-
-        const {updates} = ControlsUtils.getControls(defaultControls, newControls);
-
-        assert.equal(updates.hasPollingQAControlChanged, true);
-      });
-
-      it('returns false when previous spoken language is undefined and current is a invalid value', () => {
-        const previous = { transcribe: undefined };
-        const current = { transcribe: { spokenLanguage: null } };
-
-        const {updates} = ControlsUtils.getControls(previous, current);
-
-        assert.equal(updates.hasTranscribeSpokenLanguageChanged, false);
-      });
-
-      it('detects spoken language change when previous is undefined and current is a valid value', () => {
-        const previous = { transcribe: undefined };
-        const current = { transcribe: { spokenLanguage: 'en-US' } };
-
-        const {updates} = ControlsUtils.getControls(previous, current);
-
-        assert.equal(updates.hasTranscribeSpokenLanguageChanged, true);
-      });
-
-      it('returns false when spoken language changes to a same value', () => {
-        const previous = { transcribe: {caption: true, spokenLanguage: 'en-US' } };
-        const current = { transcribe: {caption: true, spokenLanguage: 'en-US' } };
-
-        const {updates} = ControlsUtils.getControls(previous, current);
-
-        assert.equal(updates.hasTranscribeSpokenLanguageChanged, false);
-      });
-
-      it('returns true when spoken language changes to a different value', () => {
-        const previous = { transcribe: {caption: true, spokenLanguage: 'en-US' } };
-        const current = { transcribe: {caption: true, spokenLanguage: 'fr-FR' } };
-
-        const {updates} = ControlsUtils.getControls(previous, current);
-
-        assert.equal(updates.hasTranscribeSpokenLanguageChanged, true);
-      });
-
       describe('videoEnabled', () => {
         const testVideoEnabled = (oldControls, newControls, updatedProperty) => {
           const result = ControlsUtils.getControls(oldControls, newControls);

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

@@ -305,20 +305,6 @@ describe('plugin-meetings', () => {
           {state: newControls.rdcControl}
         );
       });
-      
-      it('should trigger the CONTROLS_POLLING_QA_CHANGED event when necessary', () => {
-        locusInfo.controls = {};
-        locusInfo.emitScoped = sinon.stub();
-        newControls.pollingQAControl = { enabled: true };
-        locusInfo.updateControls(newControls);
-
-        assert.calledWith(
-          locusInfo.emitScoped,
-          {file: 'locus-info', function: 'updateControls'},
-          LOCUSINFO.EVENTS.CONTROLS_POLLING_QA_CHANGED,
-          {state: newControls.pollingQAControl}
-        );
-      });
 
       it('should keep the recording state to `IDLE`', () => {
         locusInfo.controls = {
@@ -571,34 +557,6 @@ describe('plugin-meetings', () => {
         );
       });
 
-      it('should update the transcribe spoken language', () => {
-        locusInfo.emitScoped = sinon.stub();
-        locusInfo.controls = {
-          transcribe: {
-            transcribing: false,
-            caption: true,
-            spokenLanguage: 'en-US',
-          },
-        };
-        newControls.transcribe.transcribing = false;
-        newControls.transcribe.caption = true;
-        newControls.transcribe.spokenLanguage = 'fr';
-
-        locusInfo.updateControls(newControls);
-
-        assert.calledWith(
-          locusInfo.emitScoped,
-          {
-            file: 'locus-info',
-            function: 'updateControls',
-          },
-          LOCUSINFO.EVENTS.CONTROLS_MEETING_TRANSCRIPTION_SPOKEN_LANGUAGE_UPDATED,
-          {
-            spokenLanguage: 'fr',
-          }
-        );
-      });
-
       it('should update the manual caption state', () => {
         locusInfo.emitScoped = sinon.stub();
         locusInfo.controls = {

package/test/unit/spec/meeting/brbState.ts

@@ -1,14 +1,12 @@
 import sinon from 'sinon';
-import {assert, expect} from '@webex/test-helper-chai';
+import {assert} from '@webex/test-helper-chai';
 
 import testUtils from '../../../utils/testUtils';
 import {BrbState, createBrbState} from '@webex/plugin-meetings/src/meeting/brbState';
-import LoggerProxy from '@webex/plugin-meetings/src/common/logs/logger-proxy';
 
 describe('plugin-meetings', () => {
   let meeting: any;
   let brbState: BrbState;
-  let setBrbStub: sinon.SinonStub;  
 
   beforeEach(async () => {
     meeting = {
@@ -23,20 +21,14 @@ describe('plugin-meetings', () => {
         setSourceStateOverride: sinon.stub(),
       },
       meetingRequest: {
-        setBrb: () => {}
+        setBrb: sinon.stub().resolves(),
       },
     };
 
-    setBrbStub = sinon.stub(meeting.meetingRequest, 'setBrb').resolves();
-
     brbState = new BrbState(meeting, false);
     await testUtils.flushPromises();
   });
 
-  afterEach(() => {
-    sinon.restore();
-  });
-
   describe('brbState library', () => {
     it('takes into account current status when instantiated', async () => {
       // create a new BrbState instance
@@ -137,16 +129,5 @@ describe('plugin-meetings', () => {
       sendLocalBrbStateToServerStub.restore();
       handleServerBrbUpdateSpy.restore();
     });
-
-    it('should reject when sendLocalBrbStateToServer fails', async () => {
-      const error = new Error('send failed');
-      setBrbStub.rejects(error);
-        
-      await expect(
-        brbState.enable(true, meeting.sendSlotManager)
-      ).to.be.rejectedWith(error); 
-
-      assert.isFalse(brbState.state.syncToServerInProgress);
-    });
   });
 });

package/test/unit/spec/meeting/in-meeting-actions.ts

@@ -102,8 +102,6 @@ describe('plugin-meetings', () => {
         canEnableRemoteDesktopControl: null,
         canDisableRemoteDesktopControl: null,
         canMoveToLobby: null,
-        canEnablePollingQA: null,
-        canDisablePollingQA: null,
 
         ...expected,
       };
@@ -212,8 +210,6 @@ describe('plugin-meetings', () => {
       'canEnableRemoteDesktopControl',
       'canDisableRemoteDesktopControl',
       'canMoveToLobby',
-      'canEnablePollingQA',
-      'canDisablePollingQA',
     ].forEach((key) => {
       it(`get and set for ${key} work as expected`, () => {
         const inMeetingActions = new InMeetingActions();