@webex/plugin-meetings 3.8.0-next.30 → 3.8.0-next.31

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

@@ -2664,7 +2664,7 @@ describe('plugin-meetings', () => {
 
           meeting.roap.doTurnDiscovery = sinon.stub().resolves({
             turnServerInfo: {
-              url: FAKE_TURN_URL,
+              urls: [FAKE_TURN_URL],
               username: FAKE_TURN_USER,
               password: FAKE_TURN_PASSWORD,
             },
@@ -2686,7 +2686,7 @@ describe('plugin-meetings', () => {
             meeting.id,
             sinon.match({
               turnServerInfo: {
-                url: FAKE_TURN_URL,
+                urls: [FAKE_TURN_URL],
                 username: FAKE_TURN_USER,
                 password: FAKE_TURN_PASSWORD,
               },
@@ -2744,7 +2744,7 @@ describe('plugin-meetings', () => {
             .onSecondCall()
             .returns({
               turnServerInfo: {
-                url: FAKE_TURN_URL,
+                urls: [FAKE_TURN_URL],
                 username: FAKE_TURN_USER,
                 password: FAKE_TURN_PASSWORD,
               },
@@ -2956,7 +2956,7 @@ describe('plugin-meetings', () => {
             .onSecondCall()
             .returns({
               turnServerInfo: {
-                url: FAKE_TURN_URL,
+                urls: [FAKE_TURN_URL],
                 username: FAKE_TURN_USER,
                 password: FAKE_TURN_PASSWORD,
               },
@@ -3133,7 +3133,7 @@ describe('plugin-meetings', () => {
             .onSecondCall()
             .returns({
               turnServerInfo: {
-                url: FAKE_TURN_URL,
+                urls: [FAKE_TURN_URL],
                 username: FAKE_TURN_USER,
                 password: FAKE_TURN_PASSWORD,
               },
@@ -3185,7 +3185,7 @@ describe('plugin-meetings', () => {
             .onSecondCall()
             .returns({
               turnServerInfo: {
-                url: FAKE_TURN_URL,
+                urls: [FAKE_TURN_URL],
                 username: FAKE_TURN_USER,
                 password: FAKE_TURN_PASSWORD,
               },
@@ -3637,7 +3637,7 @@ describe('plugin-meetings', () => {
 
             meeting.roap.doTurnDiscovery = sinon.stub().resolves({
               turnServerInfo: {
-                url: FAKE_TURN_URL,
+                urls: [FAKE_TURN_URL],
                 username: FAKE_TURN_USER,
                 password: FAKE_TURN_PASSWORD,
               },
@@ -3663,7 +3663,7 @@ describe('plugin-meetings', () => {
               meeting.id,
               sinon.match({
                 turnServerInfo: {
-                  url: FAKE_TURN_URL,
+                  urls: [FAKE_TURN_URL],
                   username: FAKE_TURN_USER,
                   password: FAKE_TURN_PASSWORD,
                 },
@@ -3940,7 +3940,7 @@ describe('plugin-meetings', () => {
               .resolves({id: 'fake clientMediaPreferences'});
             meeting.roap.doTurnDiscovery = sinon.stub().resolves({
               turnServerInfo: {
-                url: 'turns:turn-server-url:443?transport=tcp',
+                urls: ['turns:turn-server-url1:443?transport=tcp', 'turns:turn-server-url2:443?transport=tcp'],
                 username: 'turn user',
                 password: 'turn password',
               },
@@ -3958,12 +3958,7 @@ describe('plugin-meetings', () => {
             expectedMediaConnectionConfig = {
               iceServers: [
                 {
-                  urls: 'turn:turn-server-url:5004?transport=tcp',
-                  username: 'turn user',
-                  credential: 'turn password',
-                },
-                {
-                  urls: 'turns:turn-server-url:443?transport=tcp',
+                  urls: ['turns:turn-server-url1:443?transport=tcp', 'turns:turn-server-url2:443?transport=tcp'],
                   username: 'turn user',
                   credential: 'turn password',
                 },
@@ -5231,7 +5226,7 @@ describe('plugin-meetings', () => {
                 // and check that when we fallback to transcoded we still do another TURN discovery
                 await runCheck(
                   {
-                    url: 'turns:turn-server-url:443?transport=tcp',
+                    urls: ['turns:turn-server-url1:443?transport=tcp', 'turns:turn-server-url2:443?transport=tcp'],
                     username: 'turn user',
                     password: 'turn password',
                   },
@@ -5245,7 +5240,7 @@ describe('plugin-meetings', () => {
                 // but doing it just for completeness
                 await runCheck(
                   {
-                    url: 'turns:turn-server-url:443?transport=tcp',
+                    urls: ['turns:turn-server-url1:443?transport=tcp', 'turns:turn-server-url2:443?transport=tcp'],
                     username: 'turn user',
                     password: 'turn password',
                   },

package/test/unit/spec/reconnection-manager/index.js

@@ -60,7 +60,7 @@ describe('plugin-meetings', () => {
         roap: {
           doTurnDiscovery: sinon.stub().resolves({
             turnServerInfo: {
-              url: 'fake_turn_url',
+              urls: ['fake_turn_url1', 'fake_turn_url2'],
               username: 'fake_turn_username',
               password: 'fake_turn_password',
             },
@@ -137,7 +137,7 @@ describe('plugin-meetings', () => {
       assert.calledOnce(fakeMediaConnection.reconnect);
       assert.calledWith(fakeMediaConnection.reconnect, [
         {
-          urls: 'fake_turn_url',
+          urls: ['fake_turn_url1', 'fake_turn_url2'],
           username: 'fake_turn_username',
           credential: 'fake_turn_password',
         },
@@ -152,12 +152,12 @@ describe('plugin-meetings', () => {
     });
 
     // this can happen when we land on a video mesh node
-    it('does not use TURN server if TURN url is an empty string', async () => {
+    it('does not use TURN server if TURN urls is an empty array', async () => {
       const rm = new ReconnectionManager(fakeMeeting);
 
       fakeMeeting.roap.doTurnDiscovery.resolves({
         turnServerInfo: {
-          url: '',
+          urls: [],
           username: 'whatever',
           password: 'whatever',
         },

package/test/unit/spec/roap/turnDiscovery.ts

@@ -15,7 +15,8 @@ describe('TurnDiscovery', () => {
   let mockRoapRequest: RoapRequest;
   let testMeeting: any;
 
-  const FAKE_TURN_URL = 'turns:fakeTurnServer.com:443?transport=tcp';
+  const FAKE_TURN_URL1 = 'turns:fakeTurnServer1.com:443?transport=tcp';
+  const FAKE_TURN_URL2 = 'turns:fakeTurnServer2.com:443?transport=tcp';
   const FAKE_TURN_USERNAME = 'someUsernameFromServer';
   const FAKE_TURN_PASSWORD = 'fakePasswordFromServer';
   const FAKE_LOCUS_ID = '09493311-f5d5-3e58-b491-009cc628162e';
@@ -186,7 +187,8 @@ describe('TurnDiscovery', () => {
             {
               messageType: 'TURN_DISCOVERY_RESPONSE',
               headers: [
-                `x-cisco-turn-url=${FAKE_TURN_URL}`,
+                `x-cisco-turn-url=${FAKE_TURN_URL1}`,
+                `x-cisco-turn-url=${FAKE_TURN_URL2}`,
                 `x-cisco-turn-username=${FAKE_TURN_USERNAME}`,
                 `x-cisco-turn-password=${FAKE_TURN_PASSWORD}`,
               ],
@@ -195,7 +197,7 @@ describe('TurnDiscovery', () => {
           );
 
           await checkResult(result, 'OK', {
-            url: FAKE_TURN_URL,
+            urls: [FAKE_TURN_URL1, FAKE_TURN_URL2],
             username: FAKE_TURN_USERNAME,
             password: FAKE_TURN_PASSWORD,
           });
@@ -220,7 +222,7 @@ describe('TurnDiscovery', () => {
             {
               messageType: 'TURN_DISCOVERY_RESPONSE',
               headers: [
-                `x-cisco-turn-url=${FAKE_TURN_URL}`,
+                `x-cisco-turn-url=${FAKE_TURN_URL1}`,
                 `x-cisco-turn-username=${FAKE_TURN_USERNAME}`,
                 `x-cisco-turn-password=${FAKE_TURN_PASSWORD}`,
                 'noOkInTransaction',
@@ -230,7 +232,7 @@ describe('TurnDiscovery', () => {
           );
 
           await checkResult(result, undefined, {
-            url: FAKE_TURN_URL,
+            urls: [FAKE_TURN_URL1],
             username: FAKE_TURN_USERNAME,
             password: FAKE_TURN_PASSWORD,
           });
@@ -241,7 +243,7 @@ describe('TurnDiscovery', () => {
             mediaConnections: [
               {
                 mediaId: '464ff97f-4bda-466a-ad06-3a22184a2274',
-                remoteSdp: `{"roapMessage": {"messageType":"TURN_DISCOVERY_RESPONSE","seq":"0","headers": ["x-cisco-turn-url=${FAKE_TURN_URL}","x-cisco-turn-username=${FAKE_TURN_USERNAME}","x-cisco-turn-password=${FAKE_TURN_PASSWORD}", "noOkInTransaction"]}}`,
+                remoteSdp: `{"roapMessage": {"messageType":"TURN_DISCOVERY_RESPONSE","seq":"0","headers": ["x-cisco-turn-url=${FAKE_TURN_URL1}","x-cisco-turn-username=${FAKE_TURN_USERNAME}","x-cisco-turn-password=${FAKE_TURN_PASSWORD}", "noOkInTransaction"]}}`,
               },
             ],
           });
@@ -256,7 +258,7 @@ describe('TurnDiscovery', () => {
           mockRoapRequest.sendRoap.resetHistory();
 
           await checkResult(result, undefined, {
-            url: FAKE_TURN_URL,
+            urls: [FAKE_TURN_URL1],
             username: FAKE_TURN_USERNAME,
             password: FAKE_TURN_PASSWORD,
           });
@@ -268,7 +270,7 @@ describe('TurnDiscovery', () => {
             mediaConnections: [
               {
                 mediaId: '464ff97f-4bda-466a-ad06-3a22184a2274',
-                remoteSdp: `{"roapMessage": {"messageType":"TURN_DISCOVERY_RESPONSE","seq":"0","headers": ["x-cisco-turn-url=${FAKE_TURN_URL}","x-cisco-turn-username=${FAKE_TURN_USERNAME}","x-cisco-turn-password=${FAKE_TURN_PASSWORD}"]}}`,
+                remoteSdp: `{"roapMessage": {"messageType":"TURN_DISCOVERY_RESPONSE","seq":"0","headers": ["x-cisco-turn-url=${FAKE_TURN_URL1}","x-cisco-turn-username=${FAKE_TURN_USERNAME}","x-cisco-turn-password=${FAKE_TURN_PASSWORD}"]}}`,
               },
             ],
           };
@@ -290,7 +292,7 @@ describe('TurnDiscovery', () => {
           sendRoapPromiseResolve(sendRoapResult);
 
           await checkResult(result, 'OK', {
-            url: FAKE_TURN_URL,
+            urls: [FAKE_TURN_URL1],
             username: FAKE_TURN_USERNAME,
             password: FAKE_TURN_PASSWORD,
           });
@@ -350,16 +352,17 @@ describe('TurnDiscovery', () => {
             {
               messageType: 'TURN_DISCOVERY_RESPONSE',
               headers: [
-                `x-cisco-turn-url=${FAKE_TURN_URL}`,
+                `x-cisco-turn-url=${FAKE_TURN_URL1}`,
                 `x-cisco-turn-username=${FAKE_TURN_USERNAME}`,
                 `x-cisco-turn-password=${FAKE_TURN_PASSWORD}`,
+                `x-cisco-turn-url=${FAKE_TURN_URL2}`,
               ],
             },
             'from test'
           );
 
           await checkResult(result, 'OK', {
-            url: FAKE_TURN_URL,
+            urls: [FAKE_TURN_URL1, FAKE_TURN_URL2],
             username: FAKE_TURN_USERNAME,
             password: FAKE_TURN_PASSWORD,
           });
@@ -415,7 +418,7 @@ describe('TurnDiscovery', () => {
         {
           messageType: 'TURN_DISCOVERY_RESPONSE',
           headers: [
-            `x-cisco-turn-url=${FAKE_TURN_URL}`,
+            `x-cisco-turn-url=${FAKE_TURN_URL1}`,
             `x-cisco-turn-username=${FAKE_TURN_USERNAME}`,
             `x-cisco-turn-password=${FAKE_TURN_PASSWORD}`,
           ],
@@ -428,7 +431,7 @@ describe('TurnDiscovery', () => {
 
       const {turnServerInfo, turnDiscoverySkippedReason} = await result;
       assert.deepEqual(turnServerInfo, {
-        url: FAKE_TURN_URL,
+        urls: [FAKE_TURN_URL1],
         username: FAKE_TURN_USERNAME,
         password: FAKE_TURN_PASSWORD,
       });
@@ -455,7 +458,7 @@ describe('TurnDiscovery', () => {
         {
           messageType: 'TURN_DISCOVERY_RESPONSE',
           headers: [
-            `x-cisco-turn-url=${FAKE_TURN_URL}`,
+            `x-cisco-turn-url=${FAKE_TURN_URL1}`,
             `x-cisco-turn-username=${FAKE_TURN_USERNAME}`,
             `x-cisco-turn-password=${FAKE_TURN_PASSWORD}`,
           ],
@@ -471,7 +474,7 @@ describe('TurnDiscovery', () => {
       const {turnServerInfo, turnDiscoverySkippedReason} = await result;
 
       assert.deepEqual(turnServerInfo, {
-        url: FAKE_TURN_URL,
+        urls: [FAKE_TURN_URL1],
         username: FAKE_TURN_USERNAME,
         password: FAKE_TURN_PASSWORD,
       });
@@ -493,7 +496,7 @@ describe('TurnDiscovery', () => {
           messageType: 'TURN_DISCOVERY_RESPONSE',
           headers: [
             'x-cisco-turn-unexpected-header=xxx',
-            `x-cisco-turn-url=${FAKE_TURN_URL}`,
+            `x-cisco-turn-url=${FAKE_TURN_URL1}`,
             'x-cisco-some-other-header',
             `x-cisco-turn-username=${FAKE_TURN_USERNAME}`,
             `x-cisco-turn-password=${FAKE_TURN_PASSWORD}`,
@@ -510,7 +513,47 @@ describe('TurnDiscovery', () => {
 
       const {turnServerInfo, turnDiscoverySkippedReason} = await result;
       assert.deepEqual(turnServerInfo, {
-        url: FAKE_TURN_URL,
+        urls: [FAKE_TURN_URL1],
+        username: FAKE_TURN_USERNAME,
+        password: FAKE_TURN_PASSWORD,
+      });
+      assert.isUndefined(turnDiscoverySkippedReason);
+    });
+
+    // this happens when we land on video-mesh nodes (VMN) - we will get a single empty url
+    it('filters out any empty TURN urls', async () => {
+      const td = new TurnDiscovery(mockRoapRequest);
+      const result = td.doTurnDiscovery(testMeeting, false);
+
+      // check that TURN_DISCOVERY_REQUEST was sent
+      await checkRoapMessageSent('TURN_DISCOVERY_REQUEST', 0);
+      // @ts-ignore
+      mockRoapRequest.sendRoap.resetHistory();
+
+      // simulate the response with some empty urls, normally there would be just 1, but we put more just for the sake of testing 
+      td.handleTurnDiscoveryResponse(
+        {
+          messageType: 'TURN_DISCOVERY_RESPONSE',
+          headers: [
+            'x-cisco-turn-url=',
+            `x-cisco-turn-username=${FAKE_TURN_USERNAME}`,
+            'x-cisco-turn-url=',
+            `x-cisco-turn-password=${FAKE_TURN_PASSWORD}`,
+            'x-cisco-turn-url=non-empty-url',
+            'x-cisco-turn-url=',
+          ],
+        },
+        'from test'
+      );
+
+      await testUtils.flushPromises();
+
+      // check that we've sent OK and still parsed the headers we care about
+      await checkRoapMessageSent('OK', 0);
+
+      const {turnServerInfo, turnDiscoverySkippedReason} = await result;
+      assert.deepEqual(turnServerInfo, {
+        urls: ['non-empty-url'], // empty urls should be filtered out
         username: FAKE_TURN_USERNAME,
         password: FAKE_TURN_PASSWORD,
       });
@@ -575,7 +618,7 @@ describe('TurnDiscovery', () => {
         {
           messageType: 'TURN_DISCOVERY_RESPONSE',
           headers: [
-            `x-cisco-turn-url=${FAKE_TURN_URL}`,
+            `x-cisco-turn-url=${FAKE_TURN_URL1}`,
             `x-cisco-turn-username=${FAKE_TURN_USERNAME}`,
           ],
         },
@@ -587,7 +630,7 @@ describe('TurnDiscovery', () => {
       assert.isUndefined(turnServerInfo);
       assert.equal(
         turnDiscoverySkippedReason,
-        `failure: TURN_DISCOVERY_RESPONSE from test missing some headers: ["x-cisco-turn-url=${FAKE_TURN_URL}","x-cisco-turn-username=${FAKE_TURN_USERNAME}"]`
+        `failure: TURN_DISCOVERY_RESPONSE from test missing some headers: ["x-cisco-turn-url=${FAKE_TURN_URL1}","x-cisco-turn-username=${FAKE_TURN_USERNAME}"]`
       );
       checkFailureMetricsSent();
     });
@@ -655,7 +698,7 @@ describe('TurnDiscovery', () => {
         {
           messageType: 'TURN_DISCOVERY_RESPONSE',
           headers: [
-            `x-cisco-turn-url=${FAKE_TURN_URL}`,
+            `x-cisco-turn-url=${FAKE_TURN_URL1}`,
             `x-cisco-turn-username=${FAKE_TURN_USERNAME}`,
             `x-cisco-turn-password=${FAKE_TURN_PASSWORD}`,
           ],
@@ -707,7 +750,7 @@ describe('TurnDiscovery', () => {
         {
           messageType: 'TURN_DISCOVERY_RESPONSE',
           headers: [
-            `x-cisco-turn-url=${FAKE_TURN_URL}`,
+            `x-cisco-turn-url=${FAKE_TURN_URL1}`,
             `x-cisco-turn-username=${FAKE_TURN_USERNAME}`,
             `x-cisco-turn-password=${FAKE_TURN_PASSWORD}`,
           ],
@@ -816,7 +859,8 @@ describe('TurnDiscovery', () => {
         errorType: undefined,
         errorCause: undefined,
         headers: [
-          `x-cisco-turn-url=${FAKE_TURN_URL}`,
+          `x-cisco-turn-url=${FAKE_TURN_URL1}`,
+          `x-cisco-turn-url=${FAKE_TURN_URL2}`,
           `x-cisco-turn-username=${FAKE_TURN_USERNAME}`,
           `x-cisco-turn-password=${FAKE_TURN_PASSWORD}`,
           'noOkInTransaction',
@@ -902,7 +946,7 @@ describe('TurnDiscovery', () => {
 
       assert.deepEqual(result, {
         turnServerInfo: {
-          url: FAKE_TURN_URL,
+          urls: [FAKE_TURN_URL1, FAKE_TURN_URL2],
           username: FAKE_TURN_USERNAME,
           password: FAKE_TURN_PASSWORD,
         },
@@ -914,7 +958,7 @@ describe('TurnDiscovery', () => {
 
     it('works as expected when httpResponse is missing some headers', async () => {
       roapMessage.headers = [
-        `x-cisco-turn-url=${FAKE_TURN_URL}`, // missing headers for username and password
+        `x-cisco-turn-url=${FAKE_TURN_URL1}`, // missing headers for username and password
       ];
 
       const httpResponse = {mediaConnections: [{remoteSdp: JSON.stringify({roapMessage})}]};
@@ -930,7 +974,7 @@ describe('TurnDiscovery', () => {
       assert.deepEqual(result, {
         turnServerInfo: undefined,
         turnDiscoverySkippedReason:
-          'failure: TURN_DISCOVERY_RESPONSE in http response missing some headers: ["x-cisco-turn-url=turns:fakeTurnServer.com:443?transport=tcp"]',
+          'failure: TURN_DISCOVERY_RESPONSE in http response missing some headers: ["x-cisco-turn-url=turns:fakeTurnServer1.com:443?transport=tcp"]',
       });
       assert.calledOnceWithExactly(handleTurnDiscoveryResponseSpy, roapMessage, 'in http response');
 
@@ -939,7 +983,7 @@ describe('TurnDiscovery', () => {
 
     it('sends OK when required', async () => {
       roapMessage.headers = [
-        `x-cisco-turn-url=${FAKE_TURN_URL}`,
+        `x-cisco-turn-url=${FAKE_TURN_URL1}`,
         `x-cisco-turn-username=${FAKE_TURN_USERNAME}`,
         `x-cisco-turn-password=${FAKE_TURN_PASSWORD}`,
         // noOkInTransaction is missing
@@ -951,7 +995,7 @@ describe('TurnDiscovery', () => {
 
       assert.deepEqual(result, {
         turnServerInfo: {
-          url: FAKE_TURN_URL,
+          urls: [FAKE_TURN_URL1],
           username: FAKE_TURN_USERNAME,
           password: FAKE_TURN_PASSWORD,
         },
@@ -982,7 +1026,7 @@ describe('TurnDiscovery', () => {
           mediaConnections: [
             {
               mediaId: '464ff97f-4bda-466a-ad06-3a22184a2274',
-              remoteSdp: `{"roapMessage": {"messageType":"TURN_DISCOVERY_RESPONSE","seq":"0","headers": ["x-cisco-turn-url=${FAKE_TURN_URL}","x-cisco-turn-username=${FAKE_TURN_USERNAME}","x-cisco-turn-password=${FAKE_TURN_PASSWORD}", "noOkInTransaction"]}}`,
+              remoteSdp: `{"roapMessage": {"messageType":"TURN_DISCOVERY_RESPONSE","seq":"0","headers": ["x-cisco-turn-url=${FAKE_TURN_URL1}","x-cisco-turn-username=${FAKE_TURN_USERNAME}","x-cisco-turn-password=${FAKE_TURN_PASSWORD}", "noOkInTransaction"]}}`,
             },
           ],
         });