@webex/plugin-meetings 3.8.0-next.76 → 3.8.0-next.78

package/package.json

@@ -43,13 +43,13 @@
     "@webex/eslint-config-legacy": "0.0.0",
     "@webex/jest-config-legacy": "0.0.0",
     "@webex/legacy-tools": "0.0.0",
-    "@webex/plugin-meetings": "3.8.0-next.76",
-    "@webex/plugin-rooms": "3.8.0-next.25",
-    "@webex/test-helper-chai": "3.8.0-next.20",
-    "@webex/test-helper-mocha": "3.8.0-next.20",
-    "@webex/test-helper-mock-webex": "3.8.0-next.20",
-    "@webex/test-helper-retry": "3.8.0-next.20",
-    "@webex/test-helper-test-users": "3.8.0-next.20",
+    "@webex/plugin-meetings": "3.8.0-next.78",
+    "@webex/plugin-rooms": "3.8.0-next.26",
+    "@webex/test-helper-chai": "3.8.0-next.21",
+    "@webex/test-helper-mocha": "3.8.0-next.21",
+    "@webex/test-helper-mock-webex": "3.8.0-next.21",
+    "@webex/test-helper-retry": "3.8.0-next.21",
+    "@webex/test-helper-test-users": "3.8.0-next.21",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.24.0",
@@ -61,23 +61,23 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "3.8.0-next.20",
+    "@webex/common": "3.8.0-next.21",
     "@webex/event-dictionary-ts": "^1.0.1753",
     "@webex/internal-media-core": "2.16.0",
-    "@webex/internal-plugin-conversation": "3.8.0-next.25",
-    "@webex/internal-plugin-device": "3.8.0-next.20",
-    "@webex/internal-plugin-llm": "3.8.0-next.23",
-    "@webex/internal-plugin-mercury": "3.8.0-next.22",
-    "@webex/internal-plugin-metrics": "3.8.0-next.20",
-    "@webex/internal-plugin-support": "3.8.0-next.25",
-    "@webex/internal-plugin-user": "3.8.0-next.20",
-    "@webex/internal-plugin-voicea": "3.8.0-next.76",
-    "@webex/media-helpers": "3.8.0-next.24",
-    "@webex/plugin-people": "3.8.0-next.22",
-    "@webex/plugin-rooms": "3.8.0-next.25",
+    "@webex/internal-plugin-conversation": "3.8.0-next.26",
+    "@webex/internal-plugin-device": "3.8.0-next.21",
+    "@webex/internal-plugin-llm": "3.8.0-next.24",
+    "@webex/internal-plugin-mercury": "3.8.0-next.23",
+    "@webex/internal-plugin-metrics": "3.8.0-next.21",
+    "@webex/internal-plugin-support": "3.8.0-next.26",
+    "@webex/internal-plugin-user": "3.8.0-next.21",
+    "@webex/internal-plugin-voicea": "3.8.0-next.78",
+    "@webex/media-helpers": "3.8.0-next.25",
+    "@webex/plugin-people": "3.8.0-next.23",
+    "@webex/plugin-rooms": "3.8.0-next.26",
     "@webex/ts-sdp": "^1.8.1",
     "@webex/web-capabilities": "^1.4.0",
-    "@webex/webex-core": "3.8.0-next.20",
+    "@webex/webex-core": "3.8.0-next.21",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",
@@ -93,5 +93,5 @@
   "//": [
     "TODO: upgrade jwt-decode when moving to node 18"
   ],
-  "version": "3.8.0-next.76"
+  "version": "3.8.0-next.78"
 }

package/src/meeting/index.ts

@@ -262,7 +262,10 @@ type FetchMeetingInfoParams = {
   sendCAevents?: boolean;
 };
 
-type MediaReachabilityMetrics = ReachabilityMetrics & {isSubnetReachable: boolean};
+type MediaReachabilityMetrics = ReachabilityMetrics & {
+  isSubnetReachable: boolean;
+  selectedCluster: string | null;
+};
 
 /**
  * MediaDirection
@@ -9691,9 +9694,15 @@ export default class Meeting extends StatelessWebexPlugin {
       isSubnetReachable = this.webex.meetings.reachability.isSubnetReachable(this.mediaServerIp);
     }
 
+    let selectedCluster = null;
+    if (this.mediaConnections && this.mediaConnections.length > 0) {
+      selectedCluster = this.mediaConnections[0].mediaAgentCluster;
+    }
+
     return {
       ...reachabilityMetrics,
       isSubnetReachable,
+      selectedCluster,
     };
   }
 }

package/src/meeting-info/meeting-info-v2.ts

@@ -617,6 +617,7 @@ export default class MeetingInfoV2 {
    * @param {Object} extraParams
    * @param {Object} options
    * @param {String} registrationId
+   * @param {String} fullSiteUrl
    * @returns {Promise} returns a meeting info object
    * @public
    * @memberof MeetingInfo
@@ -633,7 +634,8 @@ export default class MeetingInfoV2 {
     locusId = null,
     extraParams: object = {},
     options: {meetingId?: string; sendCAevents?: boolean} = {},
-    registrationId: string = null
+    registrationId: string = null,
+    fullSiteUrl: string = null
   ) {
     const {meetingId, sendCAevents} = options;
 
@@ -659,6 +661,7 @@ export default class MeetingInfoV2 {
       locusId,
       extraParams,
       registrationId,
+      disableWebRedirect: true,
     });
 
     // If the body only contains the default properties, we don't have enough to
@@ -684,7 +687,9 @@ export default class MeetingInfoV2 {
 
     const directURI = await MeetingInfoUtil.getDirectMeetingInfoURI(destinationType);
 
-    if (directURI) {
+    if (fullSiteUrl) {
+      requestOptions.uri = `https://${fullSiteUrl}/wbxappapi/v1/meetingInfo`;
+    } else if (directURI) {
       requestOptions.uri = directURI;
     } else {
       requestOptions.service = WBXAPPAPI_SERVICE;

package/src/meeting-info/utilv2.ts

@@ -237,6 +237,7 @@ export default class MeetingInfoUtil {
       locusId,
       extraParams,
       registrationId,
+      disableWebRedirect,
     } = options;
     const body: any = {
       ...DEFAULT_MEETING_INFO_REQUEST_BODY,
@@ -296,6 +297,10 @@ export default class MeetingInfoUtil {
       body.locusId = locusId;
     }
 
+    if (disableWebRedirect) {
+      body.disableWebRedirect = disableWebRedirect;
+    }
+
     return body;
   }
 

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

@@ -2188,6 +2188,7 @@ describe('plugin-meetings', () => {
               someReachabilityMetric2: 'some value2',
               selectedCandidatePairChanges: 2,
               isSubnetReachable: null,
+              selectedCluster: null,
               numTransports: 1,
               iceCandidatesCount: 0,
             }
@@ -2235,6 +2236,7 @@ describe('plugin-meetings', () => {
               connectionState: 'unknown',
               iceConnectionState: 'unknown',
               isSubnetReachable: null,
+              selectedCluster: null,
             })
           );
 
@@ -2301,6 +2303,7 @@ describe('plugin-meetings', () => {
               numTransports: 1,
               iceCandidatesCount: 0,
               isSubnetReachable: null,
+              selectedCluster: null,
             }
           );
         });
@@ -2359,6 +2362,7 @@ describe('plugin-meetings', () => {
               connectionState: 'connecting',
               iceConnectionState: 'checking',
               isSubnetReachable: null,
+              selectedCluster: null,
             })
           );
 
@@ -2417,6 +2421,7 @@ describe('plugin-meetings', () => {
               connectionState: 'connecting',
               iceConnectionState: 'checking',
               isSubnetReachable: null,
+              selectedCluster: null,
             })
           );
 
@@ -2939,6 +2944,7 @@ describe('plugin-meetings', () => {
               numTransports: 1,
               iceCandidatesCount: 0,
               isSubnetReachable: null,
+              selectedCluster: null,
             },
           ]);
 
@@ -3146,6 +3152,7 @@ describe('plugin-meetings', () => {
               isJoinWithMediaRetry: false,
               iceCandidatesCount: 0,
               isSubnetReachable: null,
+              selectedCluster: null,
             },
           ]);
           meeting.roap.doTurnDiscovery;
@@ -3276,6 +3283,11 @@ describe('plugin-meetings', () => {
             stopReachability: sinon.stub(),
             isSubnetReachable: sinon.stub().returns(true),
           };
+          meeting.mediaConnections = [
+            {
+              mediaAgentCluster: 'some.cluster',
+            }
+          ]
           meeting.iceCandidatesCount = 3;
           meeting.iceCandidateErrors.set('701_error', 3);
           meeting.iceCandidateErrors.set('701_turn_host_lookup_received_error', 1);
@@ -3304,6 +3316,7 @@ describe('plugin-meetings', () => {
               '701_error': 3,
               '701_turn_host_lookup_received_error': 1,
               isSubnetReachable: null,
+              selectedCluster: 'some.cluster',
             }
           );
 
@@ -3367,6 +3380,7 @@ describe('plugin-meetings', () => {
               selectedCandidatePairChanges: 2,
               numTransports: 1,
               isSubnetReachable: null,
+              selectedCluster: null,
               iceCandidatesCount: 0,
             }
           );
@@ -3429,6 +3443,7 @@ describe('plugin-meetings', () => {
               '701_error': 2,
               '701_turn_host_lookup_received_error': 1,
               isSubnetReachable: null,
+              selectedCluster: null,
               iceCandidatesCount: 0,
             }
           );
@@ -3478,6 +3493,7 @@ describe('plugin-meetings', () => {
             iceCandidatesCount: 0,
             reachability_public_udp_success: 5,
             isSubnetReachable: false,
+            selectedCluster: null,
           });
         });
 
@@ -3539,6 +3555,7 @@ describe('plugin-meetings', () => {
               numTransports: 1,
               reachability_public_udp_success: 5,
               isSubnetReachable: true,
+              selectedCluster: null,
               iceCandidatesCount: 0,
             }
           );

package/test/unit/spec/meeting-info/meetinginfov2.js

@@ -511,6 +511,7 @@ describe('plugin-meetings', () => {
             password: 'abc',
             captchaID: '999',
             captchaVerifyCode: 'aabbcc11',
+            disableWebRedirect: true,
           },
         });
         assert.deepEqual(result, requestResponse);
@@ -544,6 +545,7 @@ describe('plugin-meetings', () => {
             supportCountryList: true,
             meetingKey: '1234323',
             installedOrgID,
+            disableWebRedirect: true,
           },
         });
         assert.deepEqual(result, requestResponse);
@@ -578,6 +580,7 @@ describe('plugin-meetings', () => {
             supportCountryList: true,
             meetingKey: '1234323',
             locusId,
+            disableWebRedirect: true,
           },
         });
         assert.deepEqual(result, requestResponse);
@@ -613,6 +616,7 @@ describe('plugin-meetings', () => {
             supportCountryList: true,
             meetingKey: '1234323',
             ...extraParams,
+            disableWebRedirect: true,
           },
         });
         assert.deepEqual(result, requestResponse);
@@ -843,6 +847,7 @@ describe('plugin-meetings', () => {
                 supportCountryList: true,
                 meetingKey: '1234323',
                 ...extraParams,
+                disableWebRedirect: true,
               },
             });
             assert.deepEqual(result, requestResponse);
@@ -922,6 +927,7 @@ describe('plugin-meetings', () => {
             supportCountryList: true,
             meetingKey: '1234323',
             ...extraParams,
+            disableWebRedirect: true,
           },
         });
         assert.deepEqual(result, requestResponse);
@@ -1065,6 +1071,41 @@ describe('plugin-meetings', () => {
         });
       });
 
+      describe('should stop call fetchMeetingInfo if siteFullUrl is empty for 404 response', () => {
+
+        const runTest = async (wbxAppApiCode, expectedIsPasswordRequired) => {
+          webex.request = sinon.stub().rejects({
+            statusCode: 404,
+            body: {
+              code: wbxAppApiCode,
+              message: 'Alternate Meeting Server',
+              data: {
+                'siteFullUrl': ''
+              }
+            },
+          });
+
+
+          try {
+            await meetingInfo.fetchMeetingInfo('1234323', DESTINATION_TYPE.MEETING_ID, 'abc', {
+              id: '999',
+              code: 'aabbcc11',
+            });
+            assert.fail('fetchMeetingInfo should have thrown, but has not done that');
+          } catch (err) {
+            assert(Metrics.sendBehavioralMetric.calledOnce);
+            assert.deepEqual(err.body.data, {
+              siteFullUrl: ''
+            });
+          }
+        };
+
+        it('should throw MeetingInfoV2CaptchaError for 404 response (wbxappapi code 404100)', async () => {
+          await runTest(404100, false);
+        });
+      });
+
+
       it('should throw an error and not fetch with an "empty" body', async () => {
         const body = {supportHostKey: 'foo', supportCountryList: 'bar'};
         const requestResponse = {statusCode: 200, body};

package/test/unit/spec/meeting-info/utilv2.js

@@ -241,6 +241,25 @@ describe('plugin-meetings', () => {
           }
         );
       });
+
+      it('allows for disableWebRedirect', () => {
+
+        const res = MeetingInfoUtil.getRequestBody({
+          type: DESTINATION_TYPE.CONVERSATION_URL,
+          destination: 'https://conv-a.wbx2.com/conversation/api/v1/conversations/bfb49281',
+          disableWebRedirect: true,
+        });
+
+        assert.deepEqual(
+          res,
+          {
+            conversationUrl: 'https://conv-a.wbx2.com/conversation/api/v1/conversations/bfb49281',
+            supportHostKey: true,
+            supportCountryList: true,
+            disableWebRedirect: true,
+          }
+        );
+      });
     });
 
     describe('#getWebexSite', () => {