@webex/plugin-meetings 1.153.3 → 1.154.2

package/src/peer-connection-manager/index.js

@@ -21,7 +21,7 @@ import {
   OFFER,
   QUALITY_LEVELS,
   MAX_FRAMESIZES,
-  METRICS_OPERATIONAL_MEASURES
+  BEHAVIORAL_METRICS
 } from '../constants';
 import {error, eventType} from '../metrics/config';
 import MediaError from '../common/errors/media';
@@ -324,6 +324,11 @@ pc.setRemoteSessionDetails = (
   if (peerConnection.signalingState === SDP.HAVE_LOCAL_OFFER || (peerConnection.signalingState === SDP.STABLE && typeStr === SDP.OFFER)) {
     sdp = setStartBitrateOnRemoteSdp(sdp);
 
+    if (!peerConnection.enableExtmap) {
+      sdp = sdp.replace(/\na=extmap.*/g, '');
+    }
+
+
     return peerConnection.setRemoteDescription(
       new window.RTCSessionDescription({
         type: typeStr,
@@ -342,7 +347,7 @@ pc.setRemoteSessionDetails = (
         LoggerProxy.logger.error(`Peer-connection-manager:index#setRemoteDescription --> ${error} missing remotesdp`);
 
 
-        const metricName = METRICS_OPERATIONAL_MEASURES.PEERCONNECTION_FAILURE;
+        const metricName = BEHAVIORAL_METRICS.PEERCONNECTION_FAILURE;
         const data = {
           correlation_id: meetingId,
           reason: error.message,
@@ -352,7 +357,7 @@ pc.setRemoteSessionDetails = (
           type: error.name
         };
 
-        Metrics.sendOperationalMetric(metricName, data, metadata);
+        Metrics.sendBehavioralMetric(metricName, data, metadata);
 
         return Metrics.postEvent({
           event: eventType.REMOTE_SDP_RECEIVED,
@@ -387,6 +392,10 @@ pc.createOffer = (peerConnection, {
 }) => {
   LoggerProxy.logger.log('PeerConnectionManager:index#createOffer --> creating a new offer');
 
+  // saving the extMap State to use in setRemoteDescription
+
+  peerConnection.enableExtmap = enableExtmap;
+
   return peerConnection
     .createOffer()
     .then((description) => {
@@ -423,8 +432,8 @@ pc.createOffer = (peerConnection, {
     .catch((error) => {
       LoggerProxy.logger.error(`Peer-connection-manager:index#createOffer --> ${error}`);
       if (error instanceof InvalidSdpError) {
-        Metrics.sendOperationalMetric(
-          METRICS_OPERATIONAL_MEASURES.INVALID_ICE_CANDIDATE,
+        Metrics.sendBehavioralMetric(
+          BEHAVIORAL_METRICS.INVALID_ICE_CANDIDATE,
           {
             correlation_id: meetingId,
             code: error.code,
@@ -433,7 +442,7 @@ pc.createOffer = (peerConnection, {
         );
       }
       else {
-        const metricName = METRICS_OPERATIONAL_MEASURES.PEERCONNECTION_FAILURE;
+        const metricName = BEHAVIORAL_METRICS.PEERCONNECTION_FAILURE;
         const data = {
           correlation_id: meetingId,
           reason: error.message,
@@ -443,7 +452,7 @@ pc.createOffer = (peerConnection, {
           type: error.name
         };
 
-        Metrics.sendOperationalMetric(metricName, data, metadata);
+        Metrics.sendBehavioralMetric(metricName, data, metadata);
       }
 
       Metrics.postEvent({
@@ -538,15 +547,15 @@ pc.createAnswer = (params, {meetingId, remoteQualityLevel}) => {
     })
     .catch((error) => {
       if (error instanceof InvalidSdpError) {
-        Metrics.sendOperationalMetric(
-          METRICS_OPERATIONAL_MEASURES.INVALID_ICE_CANDIDATE,
+        Metrics.sendBehavioralMetric(
+          BEHAVIORAL_METRICS.INVALID_ICE_CANDIDATE,
           {
             correlation_id: meetingId
           }
         );
       }
       else {
-        const metricName = METRICS_OPERATIONAL_MEASURES.PEERCONNECTION_FAILURE;
+        const metricName = BEHAVIORAL_METRICS.PEERCONNECTION_FAILURE;
         const data = {
           correlation_id: meetingId,
           reason: error.message,
@@ -556,7 +565,7 @@ pc.createAnswer = (params, {meetingId, remoteQualityLevel}) => {
           type: error.name
         };
 
-        Metrics.sendOperationalMetric(metricName, data, metadata);
+        Metrics.sendBehavioralMetric(metricName, data, metadata);
       }
 
       LoggerProxy.logger.error(`PeerConnectionManager:index#setRemoteSessionDetails --> Error creating remote session, error: ${error}`);
@@ -619,8 +628,8 @@ pc.setPeerConnectionEvents = (meeting) => {
       function: 'connectionFailed'
     });
 
-    Metrics.sendOperationalMetric(
-      METRICS_OPERATIONAL_MEASURES.CONNECTION_FAILURE,
+    Metrics.sendBehavioralMetric(
+      BEHAVIORAL_METRICS.CONNECTION_FAILURE,
       {
         correlation_id: meeting.correlationId,
         locus_id: meeting.locusId
@@ -642,6 +651,13 @@ pc.setPeerConnectionEvents = (meeting) => {
         // Ice connection state goes to connected when both client and server sends STUN packets and
         // Established connected between them. Firefox does not trigger COMPLETED and only trigger CONNECTED
         Metrics.postEvent({event: eventType.ICE_END, meeting});
+        Metrics.sendBehavioralMetric(
+          BEHAVIORAL_METRICS.CONNECTION_SUCCESS,
+          {
+            correlation_id: meeting.correlationId,
+            locus_id: meeting.locusId
+          }
+        );
         meeting.setNetworkStatus(NETWORK_STATUS.CONNECTED);
         meeting.reconnectionManager.iceReconnected();
         LoggerProxy.logger.info('PeerConnectionManager:index#setPeerConnectionEvents --> ICE STATE CONNECTED.');

package/src/reconnection-manager/index.js

@@ -8,7 +8,7 @@ import LoggerProxy from '../common/logs/logger-proxy';
 import Trigger from '../common/events/trigger-proxy';
 import {
   EVENT_TRIGGERS,
-  METRICS_OPERATIONAL_MEASURES,
+  BEHAVIORAL_METRICS,
   RECONNECTION,
   SHARE_STATUS,
   SHARE_STOPPED_REASON,
@@ -424,8 +424,8 @@ export default class ReconnectionManager {
       }
       else {
         LoggerProxy.logger.error('ReconnectionManager:index#rejoinMeeting --> Unable to rejoin meeting after max attempts.', joinError);
-        Metrics.sendOperationalMetric(
-          METRICS_OPERATIONAL_MEASURES.MEETING_MAX_REJOIN_FAILURE,
+        Metrics.sendBehavioralMetric(
+          BEHAVIORAL_METRICS.MEETING_MAX_REJOIN_FAILURE,
           {
             locus_id: this.meeting.locusUrl.split('/').pop(),
             reason: joinError.message,

package/src/roap/handler.js

@@ -2,7 +2,7 @@
 import {StatelessWebexPlugin} from '@webex/webex-core';
 
 import LoggerProxy from '../common/logs/logger-proxy';
-import {ROAP, _OFFER_, METRICS_OPERATIONAL_MEASURES} from '../constants';
+import {ROAP, _OFFER_, BEHAVIORAL_METRICS} from '../constants';
 import Metrics from '../metrics';
 
 import RoapUtil from './util';
@@ -44,14 +44,14 @@ const handleSessionStep = ({
   if (session.OFFER && messageType === _OFFER_) {
     session.GLARE_OFFER = roap.msg;
     session.GLARE_OFFER.remote = !!roap.remote;
-    const metricName = METRICS_OPERATIONAL_MEASURES.ROAP_GLARE_CONDITION;
+    const metricName = BEHAVIORAL_METRICS.ROAP_GLARE_CONDITION;
     const data = {
       correlation_id: correlationId,
       locus_id: locusUrl.split('/').pop(),
       sequence: sequenceId
     };
 
-    Metrics.sendOperationalMetric(metricName, data);
+    Metrics.sendBehavioralMetric(metricName, data);
 
     LoggerProxy.logger.warn(`Roap:handler#handleSessionStep --> Glare condition occurred with new mercury event, sequenceId: ${sequenceId}`);
   }
@@ -112,7 +112,7 @@ export default class RoapHandler extends StatelessWebexPlugin {
               });
             })
             .catch((error) => {
-              const metricName = METRICS_OPERATIONAL_MEASURES.ROAP_ANSWER_FAILURE;
+              const metricName = BEHAVIORAL_METRICS.ROAP_ANSWER_FAILURE;
               const data = {
                 correlation_id: meeting.correlationId,
                 locus_id: meeting.locusUrl.split('/').pop(),
@@ -123,7 +123,7 @@ export default class RoapHandler extends StatelessWebexPlugin {
                 type: error.name
               };
 
-              Metrics.sendOperationalMetric(metricName, data, metadata);
+              Metrics.sendBehavioralMetric(metricName, data, metadata);
               LoggerProxy.logger.error(`Roap:handler#perform --> Error occured during wait receive answer, continuing, ${error}`);
             });
         }

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

@@ -30,7 +30,7 @@ import Metrics from '@webex/plugin-meetings/src/metrics';
 import {
   FLOOR_ACTION,
   SHARE_STATUS,
-  METRICS_OPERATIONAL_MEASURES,
+  BEHAVIORAL_METRICS,
   MEETING_INFO_FAILURE_REASON,
   PASSWORD_STATUS,
   EVENTS,
@@ -610,6 +610,17 @@ describe('plugin-meetings', () => {
         });
       });
       describe('#join', () => {
+        let sandbox = null;
+
+        beforeEach(() => {
+          sandbox = sinon.createSandbox();
+        });
+
+        afterEach(() => {
+          sandbox.restore();
+          sandbox = null;
+        });
+
         it('should have #join', () => {
           assert.exists(meeting.join);
         });
@@ -619,8 +630,9 @@ describe('plugin-meetings', () => {
         });
         describe('successful', () => {
           beforeEach(() => {
-            MeetingUtil.joinMeeting = sinon.stub().returns(Promise.resolve());
+            sandbox.stub(MeetingUtil, 'joinMeeting').returns(Promise.resolve());
           });
+
           it('should join the meeting and return promise', async () => {
             const join = meeting.join();
 
@@ -650,9 +662,10 @@ describe('plugin-meetings', () => {
         });
         describe('failure', () => {
           beforeEach(() => {
-            MeetingUtil.joinMeeting = sinon.stub().returns(Promise.reject());
+            sandbox.stub(MeetingUtil, 'joinMeeting').returns(Promise.reject());
             meeting.logger.log = sinon.stub().returns(true);
           });
+
           describe('guest join', () => {
             beforeEach(() => {
               MeetingUtil.isPinOrGuest = sinon.stub().returns(true);
@@ -2420,12 +2433,12 @@ describe('plugin-meetings', () => {
           });
 
           it('should send metrics on reconnect failure', async () => {
-            sandbox.stub(Metrics, 'sendOperationalMetric');
+            sandbox.stub(Metrics, 'sendBehavioralMetric');
             await assert.isRejected(meeting.reconnect());
-            assert(Metrics.sendOperationalMetric.calledOnce);
+            assert(Metrics.sendBehavioralMetric.calledOnce);
             assert.calledWith(
-              Metrics.sendOperationalMetric,
-              METRICS_OPERATIONAL_MEASURES.MEETING_RECONNECT_FAILURE,
+              Metrics.sendBehavioralMetric,
+              BEHAVIORAL_METRICS.MEETING_RECONNECT_FAILURE,
               {
                 correlation_id: meeting.correlationId,
                 locus_id: meeting.locusUrl.split('/').pop(),

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

@@ -19,10 +19,18 @@ describe('plugin-meetings', () => {
       regionCode: 'WEST-COAST'
     };
 
+    webex.internal = {
+      services: {
+        get: sinon.mock().returns('locusUrl'),
+        waitForCatalog: sinon.mock().returns(Promise.resolve({}))
+      }
+    };
+
     meetingsRequest = new MeetingRequest({}, {
       parent: webex
     });
 
+
     meetingsRequest.request = sinon.mock().returns(Promise.resolve({}));
   });
 
@@ -112,12 +120,15 @@ describe('plugin-meetings', () => {
         const deviceUrl = 'deviceUrl';
         const correlationId = 'random-uuid';
         const roapMessage = 'roap-message';
+        const permissionToken = 'permission-token';
 
         await meetingsRequest.joinMeeting({
           locusUrl,
           deviceUrl,
           correlationId,
-          roapMessage
+          roapMessage,
+          permissionToken
+
         });
         const requestParams = meetingsRequest.request.getCall(0).args[0];
 
@@ -125,8 +136,49 @@ describe('plugin-meetings', () => {
         assert.equal(requestParams.uri, `${locusUrl}/participant?alternateRedirect=true`);
         assert.equal(requestParams.body.device.url, deviceUrl);
         assert.equal(requestParams.body.device.countryCode, 'US');
+        assert.equal(requestParams.body.permissionToken, 'permission-token');
         assert.equal(requestParams.body.device.regionCode, 'WEST-COAST');
       });
+
+      it('sends /call with meetingNumber if inviteeAddress does not exist', async () => {
+        const deviceUrl = 'deviceUrl';
+        const correlationId = 'random-uuid';
+        const roapMessage = 'roap-message';
+        const meetingNumber = 'meetingNumber';
+
+        await meetingsRequest.joinMeeting({
+          deviceUrl,
+          correlationId,
+          roapMessage,
+          meetingNumber
+        });
+        const requestParams = meetingsRequest.request.getCall(0).args[0];
+
+        assert.equal(requestParams.method, 'POST');
+        assert.equal(requestParams.uri, 'locusUrl/loci/call?alternateRedirect=true');
+        assert.equal(requestParams.body.invitee.address, 'wbxmn:meetingNumber');
+      });
+
+      it('sends /call with inviteeAddress over meetingNumber as preference', async () => {
+        const deviceUrl = 'deviceUrl';
+        const correlationId = 'random-uuid';
+        const roapMessage = 'roap-message';
+        const meetingNumber = 'meetingNumber';
+        const inviteeAddress = 'sipUrl';
+
+        await meetingsRequest.joinMeeting({
+          deviceUrl,
+          correlationId,
+          roapMessage,
+          meetingNumber,
+          inviteeAddress
+        });
+        const requestParams = meetingsRequest.request.getCall(0).args[0];
+
+        assert.equal(requestParams.method, 'POST');
+        assert.equal(requestParams.uri, 'locusUrl/loci/call?alternateRedirect=true');
+        assert.equal(requestParams.body.invitee.address, 'sipUrl');
+      });
     });
 
     describe('#pstn', () => {

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

@@ -4,6 +4,7 @@ import MeetingUtil from '@webex/plugin-meetings/src/meeting/util';
 import LoggerProxy from '@webex/plugin-meetings/src/common/logs/logger-proxy';
 import LoggerConfig
   from '@webex/plugin-meetings/src/common/logs/logger-config';
+import Metrics from '@webex/plugin-meetings/src/metrics/index';
 
 describe('plugin-meetings', () => {
   describe('Meeting utils function', () => {
@@ -11,6 +12,7 @@ describe('plugin-meetings', () => {
     const meeting = {};
 
     beforeEach(() => {
+      Metrics.postEvent = sinon.stub();
       const logger = {
         info: sandbox.stub(),
         log: sandbox.stub(),
@@ -132,6 +134,45 @@ describe('plugin-meetings', () => {
         });
       });
     });
+
+    describe('joinMeeting', () => {
+      it('#Should call `meetingRequest.joinMeeting', async () => {
+        const meeting = {meetingJoinUrl: 'meetingJoinUrl', locusUrl: 'locusUrl', meetingRequest: {joinMeeting: sinon.stub().returns(Promise.resolve({body: {}, headers: {}}))}};
+
+        MeetingUtil.parseLocusJoin = sinon.stub();
+        await MeetingUtil.joinMeeting(meeting, {});
+
+        assert.calledOnce(meeting.meetingRequest.joinMeeting);
+        const parameter = meeting.meetingRequest.joinMeeting.getCall(0).args[0];
+
+        assert.equal(parameter.inviteeAddress, 'meetingJoinUrl');
+      });
+
+      it('#Should fallback sipUrl if meetingJoinUrl does not exists', async () => {
+        const meeting = {sipUri: 'sipUri', locusUrl: 'locusUrl', meetingRequest: {joinMeeting: sinon.stub().returns(Promise.resolve({body: {}, headers: {}}))}};
+
+        MeetingUtil.parseLocusJoin = sinon.stub();
+        await MeetingUtil.joinMeeting(meeting, {});
+
+        assert.calledOnce(meeting.meetingRequest.joinMeeting);
+        const parameter = meeting.meetingRequest.joinMeeting.getCall(0).args[0];
+
+        assert.equal(parameter.inviteeAddress, 'sipUri');
+      });
+
+      it('#Should fallback to meetingNumber if meetingJoinUrl/sipUrl  does not exists', async () => {
+        const meeting = {meetingNumber: 'meetingNumber', locusUrl: 'locusUrl', meetingRequest: {joinMeeting: sinon.stub().returns(Promise.resolve({body: {}, headers: {}}))}};
+
+        MeetingUtil.parseLocusJoin = sinon.stub();
+        await MeetingUtil.joinMeeting(meeting, {});
+
+        assert.calledOnce(meeting.meetingRequest.joinMeeting);
+        const parameter = meeting.meetingRequest.joinMeeting.getCall(0).args[0];
+
+        assert.isUndefined(parameter.inviteeAddress);
+        assert.equal(parameter.meetingNumber, 'meetingNumber');
+      });
+    });
   });
 });
 

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

@@ -468,7 +468,7 @@ skipInBrowser(describe)('plugin-meetings', () => {
         });
         describe('successful MeetingInfo.#fetchMeetingInfo', () => {
           beforeEach(() => {
-            webex.meetings.meetingInfo.fetchMeetingInfo = sinon.stub().returns(Promise.resolve(true));
+            webex.meetings.meetingInfo.fetchMeetingInfo = sinon.stub().returns(Promise.resolve({body: {permissionToken: 'PT', meetingJoinUrl: 'meetingJoinUrl'}}));
           });
           it('creates the meeting from a successful meeting info fetch promise testing', async () => {
             const meeting = webex.meetings.createMeeting('test', 'test');
@@ -482,6 +482,8 @@ skipInBrowser(describe)('plugin-meetings', () => {
             assert.calledWith(webex.meetings.meetingInfo.fetchMeetingInfo, 'test');
             assert.calledWith(MeetingsUtil.extractDestination, 'test', 'test');
             assert.calledWith(MeetingsUtil.getMeetingAddedType, 'test');
+            assert.equal(meeting.permissionToken, 'PT');
+            assert.equal(meeting.meetingJoinUrl, 'meetingJoinUrl');
           });
 
           it('creates the meeting from a successful meeting info fetch meeting resolve testing', async () => {

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

@@ -90,9 +90,9 @@ browserOnly(describe)('Meeting metrics', () => {
     });
   });
 
-  describe('#sendOperationalMetric', () => {
+  describe('#sendBehavioralMetric', () => {
     it('sends client metric via Metrics plugin', () => {
-      metrics.sendOperationalMetric('myMetric');
+      metrics.sendBehavioralMetric('myMetric');
 
       assert.calledOnce(mockSubmitMetric);
     });
@@ -101,13 +101,13 @@ browserOnly(describe)('Meeting metrics', () => {
       const data = {value: 567};
       const metadata = {test: true};
 
-      metrics.sendOperationalMetric('myMetric', data, metadata);
+      metrics.sendBehavioralMetric('myMetric', data, metadata);
 
       assert.calledWithMatch(
         mockSubmitMetric,
         'myMetric',
         {
-          type: ['operational'],
+          type: ['behavioral'],
           fields: {
             browser_version: getBrowserVersion(),
             os_version: getOSVersion(),
@@ -127,8 +127,8 @@ browserOnly(describe)('Meeting metrics', () => {
 
     it('throws error if no metric name is given', () => {
       assert.throws(
-        () => metrics.sendOperationalMetric(),
-        'Missing operational metric name. Please provide one'
+        () => metrics.sendBehavioralMetric(),
+        'Missing behavioral metric name. Please provide one'
       );
     });
   });

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

@@ -21,7 +21,7 @@ describe('Peerconnection Manager', () => {
       };
     });
     describe('setRemoteSessionDetails', () => {
-      it('change the start bitrate on remoteSDP', async () => {
+      it('change the start bitrate on remoteSDP and remove extmap', async () => {
         StaticConfig.set({bandwidth: {audio: 50, video: 500, startBitrate: 2000}});
         let result = null;
         const setRemoteDescription = sinon.stub().callsFake((args) => {
@@ -33,17 +33,18 @@ describe('Peerconnection Manager', () => {
         'm=video 5004 UDP/TLS/RTP/SAVPF 102 127 97 99\r\n' +
         'a=fmtp:102 profile-level-id=42e016;packetization-mode=1;max-mbps=244800;max-fs=8160;max-fps=3000;max-dpb=12240;max-rcmd-nalu-size=196608;level-asymmetry-allowed=1\r\n' +
         'a=rtpmap:127 H264/90000\r\n' +
+        'a=extmap:3 http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions-01\r\n' +
         'a=fmtp:127 profile-level-id=42e016;max-mbps=244800;max-fs=8160;max-fps=3000;max-dpb=12240;max-rcmd-nalu-size=196608;level-asymmetry-allowed=1\r\n';
 
         const resultSdp = 'v=0\r\n' +
         'm=video 5004 UDP/TLS/RTP/SAVPF 102 127 97 99\r\n' +
         'a=fmtp:102 profile-level-id=42e016;packetization-mode=1;max-mbps=244800;max-fs=8160;max-fps=3000;max-dpb=12240;max-rcmd-nalu-size=196608;level-asymmetry-allowed=1;x-google-start-bitrate=2000\r\n' +
-        'a=rtpmap:127 H264/90000\r\n' +
+        'a=rtpmap:127 H264/90000\r\r\n' +
         'a=fmtp:127 profile-level-id=42e016;max-mbps=244800;max-fs=8160;max-fps=3000;max-dpb=12240;max-rcmd-nalu-size=196608;level-asymmetry-allowed=1;x-google-start-bitrate=2000\r\n';
         const peerConnection = {
           signalingState: 'have-local-offer',
-          setRemoteDescription
-
+          setRemoteDescription,
+          enableExtmap: false
         };
 
         await PeerConnectionManager.setRemoteSessionDetails(peerConnection, 'answer', remoteSdp, {});
@@ -68,7 +69,6 @@ describe('Peerconnection Manager', () => {
         const peerConnection = {
           signalingState: 'have-local-offer',
           setRemoteDescription
-
         };
 
         await PeerConnectionManager.setRemoteSessionDetails(peerConnection, 'answer', remoteSdp, {});