@webex/plugin-meetings 2.52.9 → 2.52.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "2.52.9",
+  "version": "2.52.11",
   "description": "",
   "license": "Cisco EULA (https://www.cisco.com/c/en/us/products/end-user-license-agreement.html)",
   "contributors": [
@@ -39,15 +39,15 @@
   "devDependencies": {
     "@babel/core": "^7.17.10",
     "@types/jsdom": "^21",
-    "@webex/babel-config-legacy": "2.52.9",
-    "@webex/eslint-config-legacy": "2.52.9",
-    "@webex/jest-config-legacy": "2.52.9",
-    "@webex/legacy-tools": "2.52.9",
-    "@webex/test-helper-chai": "2.52.9",
-    "@webex/test-helper-mocha": "2.52.9",
-    "@webex/test-helper-mock-webex": "2.52.9",
-    "@webex/test-helper-retry": "2.52.9",
-    "@webex/test-helper-test-users": "2.52.9",
+    "@webex/babel-config-legacy": "2.52.11",
+    "@webex/eslint-config-legacy": "2.52.11",
+    "@webex/jest-config-legacy": "2.52.11",
+    "@webex/legacy-tools": "2.52.11",
+    "@webex/test-helper-chai": "2.52.11",
+    "@webex/test-helper-mocha": "2.52.11",
+    "@webex/test-helper-mock-webex": "2.52.11",
+    "@webex/test-helper-retry": "2.52.11",
+    "@webex/test-helper-test-users": "2.52.11",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.24.0",
@@ -58,18 +58,18 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "2.52.9",
+    "@webex/common": "2.52.11",
     "@webex/internal-media-core": "0.0.7-beta",
-    "@webex/internal-plugin-conversation": "2.52.9",
-    "@webex/internal-plugin-device": "2.52.9",
-    "@webex/internal-plugin-mercury": "2.52.9",
-    "@webex/internal-plugin-metrics": "2.52.9",
-    "@webex/internal-plugin-support": "2.52.9",
-    "@webex/internal-plugin-user": "2.52.9",
-    "@webex/plugin-people": "2.52.9",
-    "@webex/plugin-rooms": "2.52.9",
+    "@webex/internal-plugin-conversation": "2.52.11",
+    "@webex/internal-plugin-device": "2.52.11",
+    "@webex/internal-plugin-mercury": "2.52.11",
+    "@webex/internal-plugin-metrics": "2.52.11",
+    "@webex/internal-plugin-support": "2.52.11",
+    "@webex/internal-plugin-user": "2.52.11",
+    "@webex/plugin-people": "2.52.11",
+    "@webex/plugin-rooms": "2.52.11",
     "@webex/ts-sdp": "1.0.1",
-    "@webex/webex-core": "2.52.9",
+    "@webex/webex-core": "2.52.11",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",
     "dotenv": "^4.0.0",

package/src/locus-info/selfUtils.ts

@@ -267,6 +267,7 @@ SelfUtils.getStatus = (status) => ({
 SelfUtils.wasMediaInactiveOrReleased = (oldSelf: any = {}, changedSelf: any) =>
   oldSelf.joinedWith &&
   oldSelf.joinedWith.state === _JOINED_ &&
+  changedSelf.joinedWith &&
   changedSelf.joinedWith.state === _LEFT_ &&
   (changedSelf.joinedWith.reason === MEETING_END_REASON.INACTIVE ||
     changedSelf.joinedWith.reason === MEETING_END_REASON.MEDIA_RELEASED);

package/src/meeting/index.ts

@@ -4019,11 +4019,30 @@ export default class Meeting extends StatelessWebexPlugin {
    * @memberof Meeting
    */
   public usePhoneAudio(phoneNumber: string) {
-    if (!phoneNumber) {
-      return this.dialInPstn();
-    }
+    const promise = phoneNumber ? this.dialOutPstn(phoneNumber) : this.dialInPstn();
+
+    return promise
+      .then(() => {
+        LoggerProxy.logger.info(
+          `Meeting:index#usePhoneAudio --> ${
+            phoneNumber ? 'dialOutPstn' : 'dialInPstn'
+          } request completed`
+        );
+        LoggerProxy.logger.info(
+          `Meeting:index#usePhoneAudio --> removing audio track from desktop`
+        );
 
-    return this.dialOutPstn(phoneNumber);
+        // removing audio from desktop to avoid echo as phone audio is being used
+        Media.stopTracks(this.mediaProperties.audioTrack);
+      })
+      .catch((error) => {
+        LoggerProxy.logger.error(
+          'Meeting:index#usePhoneAudio --> Failed to move audio to phone',
+          error
+        );
+
+        return Promise.reject(error);
+      });
   }
 
   /**

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

@@ -2471,14 +2471,22 @@ describe('plugin-meetings', () => {
       });
 
       describe('#usePhoneAudio', () => {
+        const fakeAudioTrack = () => ({stop: () => {}});
+        let sandbox = null;
+
         beforeEach(() => {
-          meeting.meetingRequest.dialIn = sinon
-            .stub()
-            .returns(Promise.resolve({body: {locus: 'testData'}}));
-          meeting.meetingRequest.dialOut = sinon
-            .stub()
-            .returns(Promise.resolve({body: {locus: 'testData'}}));
-          meeting.locusInfo.onFullLocus = sinon.stub().returns(Promise.resolve());
+          sandbox = sinon.createSandbox();
+          sandbox.stub(meeting.meetingRequest, 'dialIn').returns(Promise.resolve({body: {locus: 'testData'}}));
+          sandbox.stub(meeting.meetingRequest, 'dialOut').returns(Promise.resolve({body: {locus: 'testData'}}));
+          sandbox.stub(meeting.locusInfo, 'onFullLocus').returns(Promise.resolve());
+          sandbox.stub(Media, 'stopTracks').returns(Promise.resolve());
+
+          meeting.mediaProperties.audioTrack = fakeAudioTrack;
+        });
+
+        afterEach(() => {
+          sandbox.restore();
+          sandbox = null;
         });
 
         it('with no parameters triggers dial-in, delegating request to meetingRequest correctly', async () => {
@@ -2493,6 +2501,7 @@ describe('plugin-meetings', () => {
           });
           assert.calledWith(meeting.locusInfo.onFullLocus, 'testData');
           assert.notCalled(meeting.meetingRequest.dialOut);
+          assert.calledWith(Media.stopTracks, fakeAudioTrack)
 
           meeting.meetingRequest.dialIn.resetHistory();
           meeting.locusInfo.onFullLocus.resetHistory();
@@ -2508,6 +2517,7 @@ describe('plugin-meetings', () => {
           });
           assert.calledWith(meeting.locusInfo.onFullLocus, 'testData');
           assert.notCalled(meeting.meetingRequest.dialOut);
+          assert.calledWith(Media.stopTracks, fakeAudioTrack)
         });
 
         it('given a phone number, triggers dial-out, delegating request to meetingRequest correctly', async () => {
@@ -2525,6 +2535,7 @@ describe('plugin-meetings', () => {
           });
           assert.calledWith(meeting.locusInfo.onFullLocus, 'testData');
           assert.notCalled(meeting.meetingRequest.dialIn);
+          assert.calledWith(Media.stopTracks, fakeAudioTrack)
 
           meeting.meetingRequest.dialOut.resetHistory();
           meeting.locusInfo.onFullLocus.resetHistory();
@@ -2541,6 +2552,7 @@ describe('plugin-meetings', () => {
           });
           assert.calledWith(meeting.locusInfo.onFullLocus, 'testData');
           assert.notCalled(meeting.meetingRequest.dialIn);
+          assert.calledWith(Media.stopTracks, fakeAudioTrack)
         });
 
         it('rejects if the request failed (dial in)', () => {
@@ -2553,6 +2565,7 @@ describe('plugin-meetings', () => {
             .then(() => Promise.reject(new Error('Promise resolved when it should have rejected')))
             .catch((e) => {
               assert.equal(e, error);
+              assert.notCalled(Media.stopTracks)
 
               return Promise.resolve();
             });
@@ -2568,6 +2581,7 @@ describe('plugin-meetings', () => {
             .then(() => Promise.reject(new Error('Promise resolved when it should have rejected')))
             .catch((e) => {
               assert.equal(e, error);
+              assert.notCalled(Media.stopTracks)
 
               return Promise.resolve();
             });