@webex/plugin-meetings 3.5.0 → 3.6.0-next.2

package/src/meetings/index.ts

@@ -1,11 +1,12 @@
 /* eslint no-shadow: ["error", { "allow": ["eventType"] }] */
-import {union} from 'lodash';
+import {cloneDeep} from 'lodash';
 import '@webex/internal-plugin-mercury';
 import '@webex/internal-plugin-conversation';
 import '@webex/internal-plugin-metrics';
 // @ts-ignore
 import {WebexPlugin} from '@webex/webex-core';
 import {setLogger} from '@webex/internal-media-core';
+import {DeviceRegistrationOptions} from '@webex/internal-plugin-device';
 
 import * as mediaHelpersModule from '@webex/media-helpers';
 
@@ -133,6 +134,28 @@ class MediaLogger {
  * @memberof Meetings
  */
 
+/**
+ * Object containing only the most basic information about a meeting.
+ * This is the information that is kept even after the meeting is deleted from the MeetingCollection
+ */
+export type BasicMeetingInformation = {
+  allowMediaInLobby: boolean;
+  correlationId: string;
+  environment: string;
+  id: string;
+  locusUrl: string;
+  locusInfo: {
+    // it's only a very small subset of the locus info, to avoid using much memory
+    url: string;
+    fullState: {
+      lastActive: string;
+      sessionId: string;
+    };
+  };
+  meetingInfo: any;
+  sessionCorrelationId: string;
+};
+
 /**
  * Maintain a cache of meetings and sync with services.
  * @class
@@ -141,6 +164,7 @@ export default class Meetings extends WebexPlugin {
   loggerRequest: any;
   media: any;
   meetingCollection: any;
+  deletedMeetings: Map<string, BasicMeetingInformation>;
   personalMeetingRoom: any;
   preferredWebexSite: any;
   reachability: Reachability;
@@ -191,6 +215,8 @@ export default class Meetings extends WebexPlugin {
     // @ts-ignore
     this.loggerRequest = new LoggerRequest({webex: this.webex});
     this.meetingCollection = new MeetingCollection();
+    this.deletedMeetings = new Map();
+
     /**
      * The PersonalMeetingRoom object to interact with server
      * @instance
@@ -736,15 +762,35 @@ export default class Meetings extends WebexPlugin {
     }
   }
 
+  /**
+   * API to toggle backend ipv6 native support config, needs to be called before webex.meetings.register()
+   *
+   * @param {Boolean} newValue
+   * @private
+   * @memberof Meetings
+   * @returns {undefined}
+   */
+  private _toggleIpv6BackendNativeSupport(newValue: boolean) {
+    if (typeof newValue !== 'boolean') {
+      return;
+    }
+    // @ts-ignore
+    if (this.config.backendIpv6NativeSupport !== newValue) {
+      // @ts-ignore
+      this.config.backendIpv6NativeSupport = newValue;
+    }
+  }
+
   /**
    * Explicitly sets up the meetings plugin by registering
    * the device, connecting to mercury, and listening for locus events.
    *
+   * @param {DeviceRegistrationOptions} [deviceRegistrationOptions] - The options for registering the device (optional)
    * @returns {Promise}
    * @public
    * @memberof Meetings
    */
-  public register() {
+  public register(deviceRegistrationOptions?: DeviceRegistrationOptions): Promise<any> {
     // @ts-ignore
     if (!this.webex.canAuthorize) {
       LoggerProxy.logger.error(
@@ -770,7 +816,7 @@ export default class Meetings extends WebexPlugin {
       }),
       // @ts-ignore
       this.webex.internal.device
-        .register()
+        .register(deviceRegistrationOptions)
         // @ts-ignore
         .then(() =>
           LoggerProxy.logger.info(
@@ -996,35 +1042,45 @@ export default class Meetings extends WebexPlugin {
    * @memberof Meetings
    */
   fetchUserPreferredWebexSite() {
-    return this.request.getMeetingPreferences().then((res) => {
-      if (res) {
-        const preferredWebexSite = MeetingsUtil.parseDefaultSiteFromMeetingPreferences(res);
-        this.preferredWebexSite = preferredWebexSite;
-        // @ts-ignore
-        this.webex.internal.services._getCatalog().addAllowedDomains([preferredWebexSite]);
-      }
+    // @ts-ignore
+    return this.webex.people._getMe().then((me) => {
+      const isGuestUser = me.type === 'appuser';
+      if (!isGuestUser) {
+        return this.request.getMeetingPreferences().then((res) => {
+          if (res) {
+            const preferredWebexSite = MeetingsUtil.parseDefaultSiteFromMeetingPreferences(res);
+            this.preferredWebexSite = preferredWebexSite;
+            // @ts-ignore
+            this.webex.internal.services._getCatalog().addAllowedDomains([preferredWebexSite]);
+          }
 
-      // fall back to getting the preferred site from the user information
-      if (!this.preferredWebexSite) {
-        // @ts-ignore
-        return this.webex.internal.user
-          .get()
-          .then((user) => {
-            const preferredWebexSite =
-              user?.userPreferences?.userPreferencesItems?.preferredWebExSite;
-            if (preferredWebexSite) {
-              this.preferredWebexSite = preferredWebexSite;
-              // @ts-ignore
-              this.webex.internal.services._getCatalog().addAllowedDomains([preferredWebexSite]);
-            } else {
-              throw new Error('site not found');
-            }
-          })
-          .catch(() => {
-            LoggerProxy.logger.error(
-              'Failed to fetch preferred site from user - no site will be set'
-            );
-          });
+          // fall back to getting the preferred site from the user information
+          if (!this.preferredWebexSite) {
+            // @ts-ignore
+            return this.webex.internal.user
+              .get()
+              .then((user) => {
+                const preferredWebexSite =
+                  user?.userPreferences?.userPreferencesItems?.preferredWebExSite;
+                if (preferredWebexSite) {
+                  this.preferredWebexSite = preferredWebexSite;
+                  // @ts-ignore
+                  this.webex.internal.services
+                    ._getCatalog()
+                    .addAllowedDomains([preferredWebexSite]);
+                } else {
+                  throw new Error('site not found');
+                }
+              })
+              .catch(() => {
+                LoggerProxy.logger.error(
+                  'Failed to fetch preferred site from user - no site will be set'
+                );
+              });
+          }
+
+          return Promise.resolve();
+        });
       }
 
       return Promise.resolve();
@@ -1037,11 +1093,21 @@ export default class Meetings extends WebexPlugin {
    * @public
    * @memberof Meetings
    */
-
   getPersonalMeetingRoom() {
     return this.personalMeetingRoom;
   }
 
+  /**
+   * Returns basic information about a meeting that exists or
+   * used to exist in the MeetingCollection
+   *
+   * @param {string} meetingId
+   * @returns {BasicMeetingInformation|undefined}
+   */
+  public getBasicMeetingInformation(meetingId: string): BasicMeetingInformation {
+    return this.meetingCollection.get(meetingId) || this.deletedMeetings.get(meetingId);
+  }
+
   /**
    * @param {Meeting} meeting
    * @param {Object} reason
@@ -1052,6 +1118,24 @@ export default class Meetings extends WebexPlugin {
    */
   private destroy(meeting: Meeting, reason: object) {
     MeetingUtil.cleanUp(meeting);
+    // keep some basic info about the deleted meeting forever
+    this.deletedMeetings.set(meeting.id, {
+      id: meeting.id,
+      allowMediaInLobby: meeting.allowMediaInLobby,
+      correlationId: meeting.correlationId,
+      sessionCorrelationId: meeting.sessionCorrelationId,
+      environment: meeting.environment,
+      locusUrl: meeting.locusUrl,
+      meetingInfo: cloneDeep(meeting.meetingInfo),
+      locusInfo: {
+        // locusInfo can be quite big, so keep just the minimal info
+        url: meeting.locusInfo?.url,
+        fullState: {
+          lastActive: meeting.locusInfo?.fullState?.lastActive,
+          sessionId: meeting.locusInfo?.fullState?.sessionId,
+        },
+      },
+    });
     this.meetingCollection.delete(meeting.id);
     Trigger.trigger(
       this,
@@ -1081,6 +1165,7 @@ export default class Meetings extends WebexPlugin {
    * @param {CallStateForMetrics} callStateForMetrics - information about call state for metrics
    * @param {Object} [meetingInfo] - Pre-fetched complete meeting info
    * @param {String} [meetingLookupUrl] - meeting info prefetch url
+   * @param {string} sessionCorrelationId - the optional specified sessionCorrelationId (callStateForMetrics.sessionCorrelationId) can be provided instead
    * @returns {Promise<Meeting>} A new Meeting.
    * @public
    * @memberof Meetings
@@ -1094,7 +1179,8 @@ export default class Meetings extends WebexPlugin {
     failOnMissingMeetingInfo = false,
     callStateForMetrics: CallStateForMetrics = undefined,
     meetingInfo = undefined,
-    meetingLookupUrl = undefined
+    meetingLookupUrl = undefined,
+    sessionCorrelationId: string = undefined
   ) {
     // Validate meeting information based on the provided destination and
     // type. This must be performed prior to determining if the meeting is
@@ -1105,6 +1191,10 @@ export default class Meetings extends WebexPlugin {
       callStateForMetrics = {...(callStateForMetrics || {}), correlationId};
     }
 
+    if (sessionCorrelationId) {
+      callStateForMetrics = {...(callStateForMetrics || {}), sessionCorrelationId};
+    }
+
     return (
       this.meetingInfo
         .fetchInfoOptions(destination, type)
@@ -1176,10 +1266,9 @@ export default class Meetings extends WebexPlugin {
                       locusId: createdMeeting.locusId,
                       meetingId: createdMeeting.locusInfo?.info?.webExMeetingId,
                       autoupload: true,
-                    }).then(() => this.destroy(createdMeeting, payload.reason));
-                  } else {
-                    this.destroy(createdMeeting, payload.reason);
+                    });
                   }
+                  this.destroy(createdMeeting, payload.reason);
                 });
 
                 createdMeeting.on(EVENTS.REQUEST_UPLOAD_LOGS, (meetingInstance) => {
@@ -1206,7 +1295,7 @@ export default class Meetings extends WebexPlugin {
               return Promise.resolve(createdMeeting);
             });
           }
-          meeting.setCallStateForMetrics(callStateForMetrics);
+          meeting.updateCallStateForMetrics(callStateForMetrics);
 
           // Return the existing meeting.
           return Promise.resolve(meeting);

package/src/roap/request.ts

@@ -79,7 +79,9 @@ export default class RoapRequest extends StatelessWebexPlugin {
     });
 
     LoggerProxy.logger.info(
-      `Roap:request#sendRoap --> ${locusSelfUrl} \n ${roapMessage.messageType} \n seq:${roapMessage.seq}`
+      `Roap:request#sendRoap --> ${roapMessage.messageType} seq:${roapMessage.seq} ${
+        ipVersion ? `ipver=${ipVersion} ` : ''
+      } ${locusSelfUrl}`
     );
 
     return locusMediaRequest

package/test/unit/spec/media/index.ts

@@ -83,6 +83,7 @@ describe('createMediaConnection', () => {
         username: 'turn username',
         password: 'turn password',
       },
+      iceCandidatesTimeout: undefined,
     });
     assert.calledOnce(roapMediaConnectionConstructorStub);
     assert.calledWith(
@@ -100,6 +101,7 @@ describe('createMediaConnection', () => {
             credential: 'turn password',
           },
         ],
+        iceCandidatesTimeout: undefined,
         skipInactiveTransceivers: false,
         requireH264: true,
         sdpMunging: {
@@ -306,12 +308,14 @@ describe('createMediaConnection', () => {
         enableRtx: ENABLE_RTX,
         enableExtmap: ENABLE_EXTMAP,
         turnServerInfo,
+        iceCandidatesTimeout: undefined,
       });
       assert.calledOnce(roapMediaConnectionConstructorStub);
       assert.calledWith(
         roapMediaConnectionConstructorStub,
         {
           iceServers: [],
+          iceCandidatesTimeout: undefined,
           skipInactiveTransceivers: false,
           requireH264: true,
           sdpMunging: {

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

@@ -78,6 +78,7 @@ describe('plugin-meetings', () => {
         supportHDV: null,
         canShareWhiteBoard: null,
         enforceVirtualBackground: null,
+        canPollingAndQA: null,
         ...expected,
       };
 
@@ -161,6 +162,7 @@ describe('plugin-meetings', () => {
       'supportHDV',
       'canShareWhiteBoard',
       'enforceVirtualBackground',
+      'canPollingAndQA',
     ].forEach((key) => {
       it(`get and set for ${key} work as expected`, () => {
         const inMeetingActions = new InMeetingActions();

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

@@ -5,7 +5,6 @@ import 'jsdom-global/register';
 import {cloneDeep, forEach, isEqual, isUndefined} from 'lodash';
 import sinon from 'sinon';
 import * as InternalMediaCoreModule from '@webex/internal-media-core';
-import * as RtcMetricsModule from '@webex/plugin-meetings/src/rtcMetrics';
 import * as RemoteMediaManagerModule from '@webex/plugin-meetings/src/multistream/remoteMediaManager';
 import StateMachine from 'javascript-state-machine';
 import uuid from 'uuid';
@@ -307,7 +306,7 @@ describe('plugin-meetings', () => {
           assert.equal(meeting.resource, uuid2);
           assert.equal(meeting.deviceUrl, uuid3);
           assert.equal(meeting.correlationId, correlationId);
-          assert.deepEqual(meeting.callStateForMetrics, {correlationId});
+          assert.deepEqual(meeting.callStateForMetrics, {correlationId, sessionCorrelationId: ''});
           assert.deepEqual(meeting.meetingInfo, {});
           assert.instanceOf(meeting.members, Members);
           assert.calledOnceWithExactly(
@@ -376,7 +375,7 @@ describe('plugin-meetings', () => {
             }
           );
           assert.equal(newMeeting.correlationId, newMeeting.id);
-          assert.deepEqual(newMeeting.callStateForMetrics, {correlationId: newMeeting.id});
+          assert.deepEqual(newMeeting.callStateForMetrics, {correlationId: newMeeting.id, sessionCorrelationId: ''});
         });
 
         it('correlationId can be provided in callStateForMetrics', () => {
@@ -403,6 +402,37 @@ describe('plugin-meetings', () => {
             correlationId: uuid4,
             joinTrigger: 'fake-join-trigger',
             loginType: 'fake-login-type',
+            sessionCorrelationId: '',
+          });
+        });
+
+        it('sessionCorrelationId can be provided in callStateForMetrics', () => {
+          const newMeeting = new Meeting(
+            {
+              userId: uuid1,
+              resource: uuid2,
+              deviceUrl: uuid3,
+              locus: {url: url1},
+              destination: testDestination,
+              destinationType: DESTINATION_TYPE.MEETING_ID,
+              callStateForMetrics: {
+                correlationId: uuid4,
+                sessionCorrelationId: uuid1,
+                joinTrigger: 'fake-join-trigger',
+                loginType: 'fake-login-type',
+              },
+            },
+            {
+              parent: webex,
+            }
+          );
+          assert.exists(newMeeting.sessionCorrelationId);
+          assert.equal(newMeeting.sessionCorrelationId, uuid1);
+          assert.deepEqual(newMeeting.callStateForMetrics, {
+            correlationId: uuid4,
+            sessionCorrelationId: uuid1,
+            joinTrigger: 'fake-join-trigger',
+            loginType: 'fake-login-type',
           });
         });
 
@@ -1611,7 +1641,6 @@ describe('plugin-meetings', () => {
 
             assert.calledOnce(MeetingUtil.joinMeeting);
             assert.calledOnce(webex.internal.device.meetingStarted);
-            assert.calledOnce(meeting.setLocus);
             assert.equal(result, joinMeetingResult);
             assert.calledWith(webex.internal.llm.on, 'online', meeting.handleLLMOnline);
           });
@@ -2456,8 +2485,8 @@ describe('plugin-meetings', () => {
         });
 
         it('should create rtcMetrics and pass them to Media.createMediaConnection()', async () => {
-          const fakeRtcMetrics = {id: 'fake rtc metrics object'};
-          const rtcMetricsCtor = sinon.stub(RtcMetricsModule, 'default').returns(fakeRtcMetrics);
+          const setIntervalOriginal = window.setInterval;
+          window.setInterval = sinon.stub().returns(1);
 
           // setup the minimum mocks required for multistream connection
           fakeMediaConnection.createSendSlot = sinon.stub().returns({
@@ -2478,8 +2507,6 @@ describe('plugin-meetings', () => {
             mediaSettings: {},
           });
 
-          assert.calledOnceWithExactly(rtcMetricsCtor, webex, meeting.id, meeting.correlationId);
-
           // check that rtcMetrics was passed to Media.createMediaConnection
           assert.calledOnce(Media.createMediaConnection);
           assert.calledWith(
@@ -2487,10 +2514,10 @@ describe('plugin-meetings', () => {
             true,
             meeting.getMediaConnectionDebugId(),
             meeting.id,
-            sinon.match({
-              rtcMetrics: fakeRtcMetrics,
-            })
+            sinon.match.hasNested('rtcMetrics.webex', webex)
           );
+
+          window.setInterval = setIntervalOriginal;
         });
 
         it('should pass the turn server info to the peer connection', async () => {
@@ -3677,6 +3704,7 @@ describe('plugin-meetings', () => {
                   credential: 'turn password',
                 },
               ],
+              iceCandidatesTimeout: meeting.config.iceCandidatesGatheringTimeout,
               skipInactiveTransceivers: false,
               requireH264: true,
               sdpMunging: {
@@ -3761,11 +3789,16 @@ describe('plugin-meetings', () => {
             // that's being tested in these tests)
             meeting.webex.meetings.registered = true;
             meeting.webex.internal.device.config = {};
-            sinon.stub(MeetingUtil, 'joinMeeting').resolves({
+            sinon.stub(MeetingUtil, 'parseLocusJoin').returns({
               id: 'fake locus from mocked join request',
               locusUrl: 'fake locus url',
               mediaId: 'fake media id',
-            });
+            })
+            sinon.stub(meeting.meetingRequest, 'joinMeeting').resolves({
+              headers: {
+                trackingid: 'fake tracking id',
+              }
+            })
             await meeting.join({enableMultistream: isMultistream});
           });
 
@@ -6927,33 +6960,36 @@ describe('plugin-meetings', () => {
       describe('#setCorrelationId', () => {
         it('should set the correlationId and return undefined', () => {
           assert.equal(meeting.correlationId, correlationId);
-          assert.deepEqual(meeting.callStateForMetrics, {correlationId});
+          assert.deepEqual(meeting.callStateForMetrics, {correlationId, sessionCorrelationId: ''});
           meeting.setCorrelationId(uuid1);
           assert.equal(meeting.correlationId, uuid1);
-          assert.deepEqual(meeting.callStateForMetrics, {correlationId: uuid1});
+          assert.deepEqual(meeting.callStateForMetrics, {correlationId: uuid1, sessionCorrelationId: ''});
         });
       });
 
       describe('#updateCallStateForMetrics', () => {
         it('should update the callState, overriding existing values', () => {
-          assert.deepEqual(meeting.callStateForMetrics, {correlationId});
+          assert.deepEqual(meeting.callStateForMetrics, {correlationId, sessionCorrelationId: ''});
           meeting.updateCallStateForMetrics({
             correlationId: uuid1,
+            sessionCorrelationId: uuid3,
             joinTrigger: 'jt',
             loginType: 'lt',
           });
           assert.deepEqual(meeting.callStateForMetrics, {
             correlationId: uuid1,
+            sessionCorrelationId: uuid3,
             joinTrigger: 'jt',
             loginType: 'lt',
           });
         });
 
         it('should update the callState, keeping non-supplied values', () => {
-          assert.deepEqual(meeting.callStateForMetrics, {correlationId});
+          assert.deepEqual(meeting.callStateForMetrics, {correlationId, sessionCorrelationId: ''});
           meeting.updateCallStateForMetrics({joinTrigger: 'jt', loginType: 'lt'});
           assert.deepEqual(meeting.callStateForMetrics, {
             correlationId,
+            sessionCorrelationId: '',
             joinTrigger: 'jt',
             loginType: 'lt',
           });
@@ -9837,6 +9873,11 @@ describe('plugin-meetings', () => {
               requiredDisplayHints: [],
               requiredPolicies: [SELF_POLICY.SUPPORT_ANNOTATION],
             },
+            {
+              actionName: 'canPollingAndQA',
+              requiredDisplayHints: [],
+              requiredPolicies: [SELF_POLICY.SUPPORT_POLLING_AND_QA],
+            },
           ],
           ({
             actionName,