@webex/plugin-meetings 3.3.1-next.31 → 3.3.1-next.32

package/dist/webinar/index.js

@@ -62,7 +62,7 @@ var Webinar = _webexCore.WebexPlugin.extend({
   updateCanManageWebcast: function updateCanManageWebcast(canManageWebcast) {
     this.set('canManageWebcast', canManageWebcast);
   },
-  version: "3.3.1-next.31"
+  version: "3.3.1-next.32"
 });
 var _default = exports.default = Webinar;
 //# sourceMappingURL=index.js.map

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.3.1-next.31",
-    "@webex/plugin-rooms": "3.3.1-next.8",
-    "@webex/test-helper-chai": "3.3.1-next.7",
-    "@webex/test-helper-mocha": "3.3.1-next.7",
-    "@webex/test-helper-mock-webex": "3.3.1-next.7",
-    "@webex/test-helper-retry": "3.3.1-next.7",
-    "@webex/test-helper-test-users": "3.3.1-next.7",
+    "@webex/plugin-meetings": "3.3.1-next.32",
+    "@webex/plugin-rooms": "3.3.1-next.9",
+    "@webex/test-helper-chai": "3.3.1-next.8",
+    "@webex/test-helper-mocha": "3.3.1-next.8",
+    "@webex/test-helper-mock-webex": "3.3.1-next.8",
+    "@webex/test-helper-retry": "3.3.1-next.8",
+    "@webex/test-helper-test-users": "3.3.1-next.8",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.24.0",
@@ -61,21 +61,21 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "3.3.1-next.7",
+    "@webex/common": "3.3.1-next.8",
     "@webex/internal-media-core": "2.7.3",
-    "@webex/internal-plugin-conversation": "3.3.1-next.8",
-    "@webex/internal-plugin-device": "3.3.1-next.7",
-    "@webex/internal-plugin-llm": "3.3.1-next.9",
-    "@webex/internal-plugin-mercury": "3.3.1-next.8",
-    "@webex/internal-plugin-metrics": "3.3.1-next.7",
-    "@webex/internal-plugin-support": "3.3.1-next.8",
-    "@webex/internal-plugin-user": "3.3.1-next.7",
-    "@webex/internal-plugin-voicea": "3.3.1-next.31",
-    "@webex/media-helpers": "3.3.1-next.12",
-    "@webex/plugin-people": "3.3.1-next.8",
-    "@webex/plugin-rooms": "3.3.1-next.8",
+    "@webex/internal-plugin-conversation": "3.3.1-next.9",
+    "@webex/internal-plugin-device": "3.3.1-next.8",
+    "@webex/internal-plugin-llm": "3.3.1-next.10",
+    "@webex/internal-plugin-mercury": "3.3.1-next.9",
+    "@webex/internal-plugin-metrics": "3.3.1-next.8",
+    "@webex/internal-plugin-support": "3.3.1-next.9",
+    "@webex/internal-plugin-user": "3.3.1-next.8",
+    "@webex/internal-plugin-voicea": "3.3.1-next.32",
+    "@webex/media-helpers": "3.3.1-next.13",
+    "@webex/plugin-people": "3.3.1-next.9",
+    "@webex/plugin-rooms": "3.3.1-next.9",
     "@webex/web-capabilities": "^1.4.0",
-    "@webex/webex-core": "3.3.1-next.7",
+    "@webex/webex-core": "3.3.1-next.8",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",
@@ -91,5 +91,5 @@
   "//": [
     "TODO: upgrade jwt-decode when moving to node 18"
   ],
-  "version": "3.3.1-next.31"
+  "version": "3.3.1-next.32"
 }

package/src/meeting/index.ts

@@ -9,6 +9,7 @@ import {
   ClientEvent,
   ClientEventLeaveReason,
   CallDiagnosticUtils,
+  CALL_DIAGNOSTIC_CONFIG,
 } from '@webex/internal-plugin-metrics';
 import {ClientEvent as RawClientEvent} from '@webex/event-dictionary-ts';
 
@@ -5779,7 +5780,24 @@ export default class Meeting extends StatelessWebexPlugin {
             {
               logText: `${LOG_HEADER} Roap Offer`,
             }
-          ).catch(() => {
+          ).catch((error) => {
+            // @ts-ignore
+            this.webex.internal.newMetrics.submitClientEvent({
+              name: 'client.media-engine.remote-sdp-received',
+              payload: {
+                canProceed: false,
+                errors: [
+                  // @ts-ignore
+                  this.webex.internal.newMetrics.callDiagnosticMetrics.getErrorPayloadForClientErrorCode(
+                    {
+                      clientErrorCode: CALL_DIAGNOSTIC_CONFIG.MISSING_ROAP_ANSWER_CLIENT_CODE,
+                    }
+                  ),
+                ],
+              },
+              options: {meetingId: this.id, rawError: error},
+            });
+
             this.deferSDPAnswer.reject(new Error('failed to send ROAP SDP offer'));
             clearTimeout(this.sdpResponseTimer);
             this.sdpResponseTimer = undefined;
@@ -6458,6 +6476,21 @@ export default class Meeting extends StatelessWebexPlugin {
           ROAP_OFFER_ANSWER_EXCHANGE_TIMEOUT / 1000
         } seconds`
       );
+      // @ts-ignore
+      this.webex.internal.newMetrics.submitClientEvent({
+        name: 'client.media-engine.remote-sdp-received',
+        payload: {
+          canProceed: false,
+          errors: [
+            // @ts-ignore
+            this.webex.internal.newMetrics.callDiagnosticMetrics.getErrorPayloadForClientErrorCode({
+              clientErrorCode: CALL_DIAGNOSTIC_CONFIG.MISSING_ROAP_ANSWER_CLIENT_CODE,
+            }),
+          ],
+        },
+        options: {meetingId: this.id, rawError: new Error('Timeout waiting for SDP answer')},
+      });
+
       deferSDPAnswer.reject(new Error('Timed out waiting for REMOTE SDP ANSWER'));
     }, ROAP_OFFER_ANSWER_EXCHANGE_TIMEOUT);
 

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

@@ -33,6 +33,7 @@ import {
   ONLINE,
   OFFLINE,
   RECONNECTION,
+  ROAP_OFFER_ANSWER_EXCHANGE_TIMEOUT,
 } from '@webex/plugin-meetings/src/constants';
 import * as InternalMediaCoreModule from '@webex/internal-media-core';
 import {
@@ -1765,13 +1766,12 @@ describe('plugin-meetings', () => {
           meeting.audio = muteStateStub;
           meeting.video = muteStateStub;
           sinon.stub(Media, 'createMediaConnection').returns(fakeMediaConnection);
-          meeting.setMercuryListener = sinon.stub().returns(true);
-          meeting.setupMediaConnectionListeners = sinon.stub();
-          meeting.setMercuryListener = sinon.stub();
-          meeting.roap.doTurnDiscovery = sinon
-            .stub()
+          sinon.stub(meeting, 'setupMediaConnectionListeners');
+          sinon.stub(meeting, 'setMercuryListener');
+          sinon
+            .stub(meeting.roap, 'doTurnDiscovery')
             .resolves({turnServerInfo: {}, turnDiscoverySkippedReason: undefined});
-          meeting.waitForRemoteSDPAnswer = sinon.stub().resolves();
+          sinon.stub(meeting, 'waitForRemoteSDPAnswer').resolves();
 
           // normally the first Roap message we send is creating confluence, so mock LocusMediaRequest.isConfluenceCreated()
           // to return false the first time it's called and true the 2nd time, to simulate how it would happen for real
@@ -2125,6 +2125,61 @@ describe('plugin-meetings', () => {
           }
         });
 
+        it('sends correct CA event when times out waiting for SDP answer', async () => {
+          const eventListeners = {};
+          const clock = sinon.useFakeTimers();
+
+          // these 2 are stubbed, we need the real versions:
+          meeting.waitForRemoteSDPAnswer.restore();
+          meeting.setupMediaConnectionListeners.restore();
+
+          meeting.meetingState = 'ACTIVE';
+
+          // setup a mock media connection that will trigger an offer when initiateOffer() is called
+          Media.createMediaConnection = sinon.stub().returns({
+            initiateOffer: sinon.stub().callsFake(() => {
+              // simulate offer being generated
+              eventListeners[Event.LOCAL_SDP_OFFER_GENERATED]();
+
+              return Promise.resolve();
+            }),
+            close: sinon.stub(),
+            on: (event, listener) => {
+              eventListeners[event] = listener;
+            },
+            forceRtcMetricsSend: sinon.stub().resolves(),
+          });
+
+          const getErrorPayloadForClientErrorCodeStub =
+            (webex.internal.newMetrics.callDiagnosticMetrics.getErrorPayloadForClientErrorCode =
+              sinon
+                .stub()
+                .callsFake(({clientErrorCode}) => ({errorCode: clientErrorCode, fatal: true})));
+
+          const result = meeting.addMedia();
+          await testUtils.flushPromises();
+
+          // simulate timeout waiting for the SDP answer that never comes
+          await clock.tickAsync(ROAP_OFFER_ANSWER_EXCHANGE_TIMEOUT);
+
+          await assert.isRejected(result);
+
+          assert.calledOnceWithExactly(getErrorPayloadForClientErrorCodeStub, {
+            clientErrorCode: 2007,
+          });
+          assert.calledWithMatch(webex.internal.newMetrics.submitClientEvent, {
+            name: 'client.media-engine.remote-sdp-received',
+            payload: {
+              canProceed: false,
+              errors: [{errorCode: 2007, fatal: true}],
+            },
+            options: {
+              meetingId: meeting.id,
+              rawError: sinon.match.instanceOf(Error),
+            },
+          });
+        });
+
         it('if an error occurs after media request has already been sent, and the user waits until the server kicks them out, a UserNotJoinedError should be thrown when attempting to addMedia again', async () => {
           meeting.meetingState = 'ACTIVE';
           // setup the mock to cause addMedia() to fail
@@ -3200,7 +3255,7 @@ describe('plugin-meetings', () => {
               clientErrorCode: MISSING_ROAP_ANSWER_CLIENT_CODE,
               expectedErrorPayload: {
                 errorDescription: ERROR_DESCRIPTIONS.MISSING_ROAP_ANSWER,
-                category: 'signaling',
+                category: 'media',
               },
             },
             {
@@ -7890,12 +7945,18 @@ describe('plugin-meetings', () => {
           });
 
           it('handles OFFER message correctly when request fails', async () => {
+            const fakeError = new Error('fake error');
             const clock = sinon.useFakeTimers();
             sinon.spy(clock, 'clearTimeout');
             meeting.deferSDPAnswer = {reject: sinon.stub()};
             meeting.sdpResponseTimer = '1234';
-            sendRoapMediaRequestStub.rejects();
+            sendRoapMediaRequestStub.rejects(fakeError);
             sinon.stub(meeting, 'roapMessageReceived');
+            const getErrorPayloadForClientErrorCodeStub =
+              (webex.internal.newMetrics.callDiagnosticMetrics.getErrorPayloadForClientErrorCode =
+                sinon
+                  .stub()
+                  .callsFake(({clientErrorCode}) => ({errorCode: clientErrorCode, fatal: true})));
 
             eventListeners[Event.ROAP_MESSAGE_TO_SEND]({
               roapMessage: {
@@ -7920,6 +7981,21 @@ describe('plugin-meetings', () => {
             assert.calledOnce(clock.clearTimeout);
             assert.calledWith(clock.clearTimeout, '1234');
             assert.equal(meeting.sdpResponseTimer, undefined);
+
+            assert.calledOnceWithExactly(getErrorPayloadForClientErrorCodeStub, {
+              clientErrorCode: 2007,
+            });
+            assert.calledWithMatch(webex.internal.newMetrics.submitClientEvent, {
+              name: 'client.media-engine.remote-sdp-received',
+              payload: {
+                canProceed: false,
+                errors: [{errorCode: 2007, fatal: true}],
+              },
+              options: {
+                meetingId: meeting.id,
+                rawError: fakeError,
+              },
+            });
           });
 
           it('handles ANSWER message correctly', () => {