@webex/plugin-meetings 3.11.0-next.46 → 3.11.0-next.48

package/src/meeting/request.ts

@@ -1159,13 +1159,13 @@ export default class MeetingRequest extends StatelessWebexPlugin {
       method: HTTP_VERBS.GET,
       uri,
     }).catch((err) => {
-      LoggerProxy.logger.error(
-        `Meeting:request#fetchDatachannelToken --> Error retrieving ${
+      LoggerProxy.logger.warn(
+        `Meeting:request#fetchDatachannelToken --> Failed to retrieve ${
           isPracticeSession ? 'practice session ' : ''
-        }datachannel token, error ${err}`
+        }datachannel token: ${err?.message || err}`
       );
 
-      throw err;
+      return null;
     });
   }
 }

package/src/multistream/mediaRequestManager.ts

@@ -10,7 +10,7 @@ import {
   RecommendedOpusBitrates,
   NamedMediaGroup,
 } from '@webex/internal-media-core';
-import {cloneDeepWith, debounce, isEmpty} from 'lodash';
+import {cloneDeepWith, debounce} from 'lodash';
 
 import LoggerProxy from '../common/logs/logger-proxy';
 
@@ -94,8 +94,6 @@ export class MediaRequestManager {
 
   private debouncedSourceUpdateListener: () => void;
 
-  private previousStreamRequests: Array<StreamRequest> = [];
-
   private trimRequestsToNumOfSources: boolean;
   private numTotalSources: number;
   private numLiveSources: number;
@@ -161,36 +159,6 @@ export class MediaRequestManager {
     }
   }
 
-  /**
-   * Returns true if two stream requests are the same, false otherwise.
-   *
-   * @param {StreamRequest} streamRequestA - Stream request A for comparison.
-   * @param {StreamRequest} streamRequestB - Stream request B for comparison.
-   * @returns {boolean} - Whether they are equal.
-   */
-  // eslint-disable-next-line class-methods-use-this
-  public isEqual(streamRequestA: StreamRequest, streamRequestB: StreamRequest) {
-    return (
-      JSON.stringify(streamRequestA._toJmpStreamRequest()) ===
-      JSON.stringify(streamRequestB._toJmpStreamRequest())
-    );
-  }
-
-  /**
-   * Compares new stream requests to previous ones and determines
-   * if they are the same.
-   *
-   * @param {StreamRequest[]} newRequests - Array with new requests.
-   * @returns {boolean} - True if they are equal, false otherwise.
-   */
-  private checkIsNewRequestsEqualToPrev(newRequests: StreamRequest[]) {
-    return (
-      !isEmpty(this.previousStreamRequests) &&
-      this.previousStreamRequests.length === newRequests.length &&
-      this.previousStreamRequests.every((req, idx) => this.isEqual(req, newRequests[idx]))
-    );
-  }
-
   /**
    * Returns the maxPayloadBitsPerSecond per Stream
    *
@@ -230,15 +198,6 @@ export class MediaRequestManager {
     return (mediaRequest.codecInfo.maxFs * maxFps) / 100;
   }
 
-  /**
-   * Clears the previous stream requests.
-   *
-   * @returns {void}
-   */
-  public clearPreviousRequests(): void {
-    this.previousStreamRequests = [];
-  }
-
   /** Modifies the passed in clientRequests and makes sure that in total they don't ask
    *  for more streams than there are available.
    *
@@ -372,17 +331,8 @@ export class MediaRequestManager {
       }
     });
 
-    //! IMPORTANT: this is only a temporary fix. This will soon be done in the jmp layer (@webex/json-multistream)
-    // https://jira-eng-gpk2.cisco.com/jira/browse/WEBEX-326713
-    if (!this.checkIsNewRequestsEqualToPrev(streamRequests)) {
-      this.sendMediaRequestsCallback(streamRequests);
-      this.previousStreamRequests = streamRequests;
-      LoggerProxy.logger.info(`multistream:sendRequests --> media requests sent. `);
-    } else {
-      LoggerProxy.logger.info(
-        `multistream:sendRequests --> detected duplicate WCME requests, skipping them... `
-      );
-    }
+    this.sendMediaRequestsCallback(streamRequests);
+    LoggerProxy.logger.info(`multistream:sendRequests --> media requests sent. `);
   }
 
   public addRequest(mediaRequest: MediaRequest, commit = true): MediaRequestId {

package/src/reconnection-manager/index.ts

@@ -609,7 +609,6 @@ export default class ReconnectionManager {
     if (this.meeting.isMultistream) {
       Object.values(this.meeting.mediaRequestManagers).forEach(
         (mediaRequestManager: MediaRequestManager) => {
-          mediaRequestManager.clearPreviousRequests();
           mediaRequestManager.commit();
         }
       );

package/src/webinar/index.ts

@@ -177,6 +177,8 @@ const Webinar = WebexPlugin.extend({
 
     const finalToken = currentToken ?? practiceSessionDatachannelToken;
 
+    const isCaptionBoxOn = this.webex.internal.voicea.getIsCaptionBoxOn();
+
     if (!currentToken && practiceSessionDatachannelToken) {
       // @ts-ignore
       this.webex.internal.llm.setDatachannelToken(
@@ -219,6 +221,9 @@ const Webinar = WebexPlugin.extend({
         );
         // @ts-ignore - Fix type
         this.webex.internal.voicea?.announce?.();
+        if (isCaptionBoxOn) {
+          this.webex.internal.voicea.updateSubchannelSubscriptions({subscribe: ['transcription']});
+        }
         LoggerProxy.logger.info(
           `Webinar:index#updatePSDataChannel --> enabled to receive relay events for default session for ${LLM_PRACTICE_SESSION}!`
         );

package/test/unit/spec/interceptors/dataChannelAuthToken.ts

@@ -5,6 +5,7 @@ import MockWebex from '@webex/test-helper-mock-webex';
 import {WebexHttpError} from '@webex/webex-core';
 import DataChannelAuthTokenInterceptor from '@webex/plugin-meetings/src/interceptors/dataChannelAuthToken';
 import LoggerProxy from '@webex/plugin-meetings/src/common/logs/logger-proxy';
+import * as utils from '@webex/plugin-meetings/src/interceptors/utils';
 import {DATA_CHANNEL_AUTH_HEADER, MAX_RETRY} from '@webex/plugin-meetings/src/interceptors/constant';
 
 describe('plugin-meetings', () => {
@@ -14,6 +15,10 @@ describe('plugin-meetings', () => {
 
       beforeEach(() => {
         clock = sinon.useFakeTimers();
+        sinon.stub(LoggerProxy, 'logger').value({
+          error: sinon.stub(),
+          warn: sinon.stub(),
+        });
 
         webex = new MockWebex({children: {}});
         webex.request = sinon.stub().resolves({});
@@ -25,6 +30,7 @@ describe('plugin-meetings', () => {
       });
 
       afterEach(() => {
+        sinon.restore();
         clock.restore();
       });
 
@@ -86,6 +92,69 @@ describe('plugin-meetings', () => {
         });
       });
 
+      describe('#onRequest', () => {
+        let isJwtTokenExpiredStub;
+
+        beforeEach(() => {
+          isJwtTokenExpiredStub = sinon.stub(utils, 'isJwtTokenExpired').returns(false);
+        });
+
+        it('does nothing when token is missing', async () => {
+          const options = {headers: {}};
+
+          const res = await interceptor.onRequest(options);
+
+          expect(res).to.equal(options);
+          sinon.assert.notCalled(isJwtTokenExpiredStub);
+        });
+
+        it('does nothing when feature is disabled', async () => {
+          interceptor._isDataChannelTokenEnabled.resolves(false);
+
+          const options = {headers: {[DATA_CHANNEL_AUTH_HEADER]: 'old-token'}};
+          const res = await interceptor.onRequest(options);
+
+          expect(res).to.equal(options);
+          sinon.assert.notCalled(isJwtTokenExpiredStub);
+        });
+
+        it('does not refresh when token is not expired', async () => {
+          interceptor._isDataChannelTokenEnabled.resolves(true);
+          isJwtTokenExpiredStub.returns(false);
+
+          const options = {headers: {[DATA_CHANNEL_AUTH_HEADER]: 'old-token'}};
+          const res = await interceptor.onRequest(options);
+
+          sinon.assert.notCalled(interceptor._refreshDataChannelToken);
+          expect(res.headers[DATA_CHANNEL_AUTH_HEADER]).to.equal('old-token');
+        });
+
+        it('refreshes token when expired', async () => {
+          interceptor._isDataChannelTokenEnabled.resolves(true);
+          isJwtTokenExpiredStub.returns(true);
+
+          interceptor._refreshDataChannelToken.resolves('new-token');
+
+          const options = {headers: {[DATA_CHANNEL_AUTH_HEADER]: 'old-token'}};
+          const res = await interceptor.onRequest(options);
+
+          sinon.assert.calledOnce(interceptor._refreshDataChannelToken);
+          expect(res.headers[DATA_CHANNEL_AUTH_HEADER]).to.equal('new-token');
+        });
+
+        it('continues request when refresh fails', async () => {
+          interceptor._isDataChannelTokenEnabled.resolves(true);
+          isJwtTokenExpiredStub.returns(true);
+
+          interceptor._refreshDataChannelToken.rejects(new Error('refresh failed'));
+
+          const options = {headers: {[DATA_CHANNEL_AUTH_HEADER]: 'old-token'}};
+          const res = await interceptor.onRequest(options);
+
+          expect(res.headers[DATA_CHANNEL_AUTH_HEADER]).to.equal('old-token');
+        });
+      });
+
       describe('#refreshTokenAndRetryWithDelay', () => {
         const options = {
           headers: {[DATA_CHANNEL_AUTH_HEADER]: 'old-token'},

package/test/unit/spec/interceptors/utils.ts

@@ -0,0 +1,75 @@
+import 'jsdom-global/register';
+import {expect} from '@webex/test-helper-chai';
+import sinon from 'sinon';
+import {isJwtTokenExpired} from '@webex/plugin-meetings/src/interceptors/utils';
+
+const makeJwt = (payload) =>
+  [
+    Buffer.from(JSON.stringify({alg: 'none', typ: 'JWT'})).toString('base64url'),
+    Buffer.from(JSON.stringify(payload)).toString('base64url'),
+    ''
+  ].join('.');
+
+describe('plugin-meetings', () => {
+  describe('Interceptors', () => {
+    describe('utils - isJwtTokenExpired', () => {
+      let clock;
+
+      beforeEach(() => {
+        clock = sinon.useFakeTimers();
+      });
+
+      afterEach(() => {
+        sinon.restore();
+        clock.restore();
+      });
+
+      it('returns false when token has no exp', () => {
+        const token = makeJwt({}); // no exp
+
+        const result = isJwtTokenExpired(token);
+
+        expect(result).to.equal(false);
+      });
+
+      it('returns false when token is not expired', () => {
+        const now = Date.now();
+        const futureExp = Math.floor((now + 60 * 1000) / 1000);
+
+        const token = makeJwt({exp: futureExp});
+
+        const result = isJwtTokenExpired(token);
+
+        expect(result).to.equal(false);
+      });
+
+      it('returns true when token is expired', () => {
+        const now = Date.now();
+        const pastExp = Math.floor((now - 60 * 1000) / 1000);
+
+        const token = makeJwt({exp: pastExp});
+
+        const result = isJwtTokenExpired(token);
+
+        expect(result).to.equal(true);
+      });
+
+      it('returns true when token expires within EXPIRY_BUFFER', () => {
+        const now = Date.now();
+        const expSoon = Math.floor((now + 10 * 1000) / 1000);
+
+        const token = makeJwt({exp: expSoon});
+
+        const result = isJwtTokenExpired(token);
+
+        expect(result).to.equal(true);
+      });
+
+      it('returns true when token is invalid', () => {
+        const result = isJwtTokenExpired('not-a-jwt');
+
+        expect(result).to.equal(true);
+      });
+    });
+  });
+});

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

@@ -13029,7 +13029,7 @@ describe('plugin-meetings', () => {
             'a datachannel url',
             'token-123'
           );
-          assert.calledWithExactly(webex.internal.llm.setDatachannelToken, 'token-123', 'default');
+          assert.calledWithExactly(webex.internal.llm.setDatachannelToken, 'token-123', 'llm-default-session');
         });
         it('prefers refreshed token over locus self token', async () => {
           meeting.joinedWith = {state: 'JOINED'};
@@ -13039,7 +13039,7 @@ describe('plugin-meetings', () => {
             self: {datachannelToken: 'locus-token'},
           };
 
-          webex.internal.llm.getDatachannelToken.withArgs('default').returns('refreshed-token');
+          webex.internal.llm.getDatachannelToken.withArgs('llm-default-session').returns('refreshed-token');
 
           await meeting.updateLLMConnection();
 
@@ -13072,7 +13072,7 @@ describe('plugin-meetings', () => {
             'a datachannel url',
             'token-123'
           );
-          assert.calledWithExactly(webex.internal.llm.setDatachannelToken, 'token-123', 'default');
+          assert.calledWithExactly(webex.internal.llm.setDatachannelToken, 'token-123', 'llm-default-session');
         });
 
         describe('#clearMeetingData', () => {
@@ -14735,7 +14735,7 @@ describe('plugin-meetings', () => {
           expect(result).to.deep.equal({
             body: {
               datachannelToken: 'mock-token',
-              dataChannelTokenType: 'practiceSession',
+              dataChannelTokenType: 'llm-practice-session',
             },
           });
         });
@@ -14748,7 +14748,7 @@ describe('plugin-meetings', () => {
 
           const result = meeting.getDataChannelTokenType();
 
-          expect(result).to.equal('practiceSession');
+          expect(result).to.equal('llm-practice-session');
         });
 
         it('returns Default when not in practice session mode', () => {
@@ -14758,7 +14758,7 @@ describe('plugin-meetings', () => {
 
           const result = meeting.getDataChannelTokenType();
 
-          expect(result).to.equal('default');
+          expect(result).to.equal('llm-default-session');
         });
       });
       describe('#stopKeepAlive', () => {

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

@@ -924,7 +924,14 @@ describe('plugin-meetings', () => {
     const locusUrl = 'https://locus.example.com/locus/api/v1/loci/123';
     const participantId = 'participant-123';
 
+    beforeEach(() => {
+      sinon.restore();
+      locusDeltaRequestSpy = sinon.stub(meetingsRequest, 'locusDeltaRequest');
+    });
+
     it('sends GET request to regular datachannel token endpoint', async () => {
+      locusDeltaRequestSpy.resolves({body: {}});
+
       await meetingsRequest.fetchDatachannelToken({
         locusUrl,
         requestingParticipantId: participantId,
@@ -938,6 +945,8 @@ describe('plugin-meetings', () => {
     });
 
     it('sends GET request to practice session datachannel token endpoint', async () => {
+      locusDeltaRequestSpy.resolves({body: {}});
+
       await meetingsRequest.fetchDatachannelToken({
         locusUrl,
         requestingParticipantId: participantId,
@@ -950,7 +959,7 @@ describe('plugin-meetings', () => {
       });
     });
 
-    it('throws if locusUrl or participantId is missing', async () => {
+    it('rejects when locusUrl or participantId is missing', async () => {
       await assert.isRejected(
         meetingsRequest.fetchDatachannelToken({
           locusUrl: null,
@@ -968,18 +977,15 @@ describe('plugin-meetings', () => {
       );
     });
 
-    it('logs and rethrows error when locusDeltaRequest fails', async () => {
-      const error = new Error('network error');
-      locusDeltaRequestSpy.restore();
-      sinon.stub(meetingsRequest, 'locusDeltaRequest').rejects(error);
+    it('returns null when locusDeltaRequest fails', async () => {
+      locusDeltaRequestSpy.rejects(new Error('network error'));
 
-      await assert.isRejected(
-        meetingsRequest.fetchDatachannelToken({
-          locusUrl,
-          requestingParticipantId: participantId,
-        }),
-        /network error/
-      );
+      const result = await meetingsRequest.fetchDatachannelToken({
+        locusUrl,
+        requestingParticipantId: participantId,
+      });
+
+      assert.equal(result, null);
     });
   });
 });

package/test/unit/spec/multistream/mediaRequestManager.ts

@@ -666,8 +666,8 @@ describe('MediaRequestManager', () => {
     ]);
   });
 
-  it('avoids sending duplicate requests and clears all the requests on reset()', () => {
-    // send some requests and commit them one by one
+  it('clears all the requests on reset()', () => {
+    // send some requests and commit them
     addReceiverSelectedRequest(1500, fakeReceiveSlots[0], MAX_FS_1080p, false);
     addReceiverSelectedRequest(1501, fakeReceiveSlots[1], MAX_FS_1080p, false);
     addActiveSpeakerRequest(
@@ -722,95 +722,12 @@ describe('MediaRequestManager', () => {
       },
     ]);
 
-    // check that when calling commit()
-    // all requests are not re-sent again (avoid duplicate requests)
-    mediaRequestManager.commit();
-
-    assert.notCalled(sendMediaRequestsCallback);
-
-    // now reset everything
-    mediaRequestManager.reset();
-
-    // calling commit now should not cause any requests to be sent out
-    mediaRequestManager.commit();
-    checkMediaRequestsSent([]);
-  });
-
-  it('makes sure to call requests correctly after reset was called and another request was added', () => {
-    addReceiverSelectedRequest(1500, fakeReceiveSlots[0], MAX_FS_1080p, false);
-
-    assert.notCalled(sendMediaRequestsCallback);
-
-    mediaRequestManager.commit();
-    checkMediaRequestsSent([
-      {
-        policy: 'receiver-selected',
-        csi: 1500,
-        receiveSlot: fakeWcmeSlots[0],
-        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
-        maxFs: MAX_FS_1080p,
-        maxMbps: MAX_MBPS_1080p,
-      },
-    ]);
-
     // now reset everything
     mediaRequestManager.reset();
 
     // calling commit now should not cause any requests to be sent out
     mediaRequestManager.commit();
     checkMediaRequestsSent([]);
-
-    //add new request
-    addReceiverSelectedRequest(1501, fakeReceiveSlots[1], MAX_FS_1080p, false);
-
-    // commit
-    mediaRequestManager.commit();
-
-    // check the new request was sent
-    checkMediaRequestsSent([
-      {
-        policy: 'receiver-selected',
-        csi: 1501,
-        receiveSlot: fakeWcmeSlots[1],
-        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
-        maxFs: MAX_FS_1080p,
-        maxMbps: MAX_MBPS_1080p,
-      },
-    ]);
-  });
-
-  it('can send same media request after previous requests have been cleared', () => {
-    // add a request and commit
-    addReceiverSelectedRequest(1500, fakeReceiveSlots[0], MAX_FS_1080p, false);
-    mediaRequestManager.commit();
-    checkMediaRequestsSent([
-      {
-        policy: 'receiver-selected',
-        csi: 1500,
-        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
-        receiveSlot: fakeWcmeSlots[0],
-        maxFs: MAX_FS_1080p,
-        maxMbps: MAX_MBPS_1080p,
-      },
-    ]);
-
-    // clear previous requests
-    mediaRequestManager.clearPreviousRequests();
-
-    // commit same request
-    mediaRequestManager.commit();
-
-    // check the request was sent
-    checkMediaRequestsSent([
-      {
-        policy: 'receiver-selected',
-        csi: 1500,
-        maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_1080p,
-        receiveSlot: fakeWcmeSlots[0],
-        maxFs: MAX_FS_1080p,
-        maxMbps: MAX_MBPS_1080p,
-      },
-    ]);
   });
 
   it('re-sends media requests after degradation preferences are set', () => {

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

@@ -54,8 +54,8 @@ describe('plugin-meetings', () => {
           webrtcMediaConnection: fakeMediaConnection,
         },
         mediaRequestManagers: {
-          audio: {commit: sinon.stub(), clearPreviousRequests: sinon.stub()},
-          video: {commit: sinon.stub(), clearPreviousRequests: sinon.stub()},
+          audio: {commit: sinon.stub()},
+          video: {commit: sinon.stub()},
         },
         roap: {
           doTurnDiscovery: sinon.stub().resolves({
@@ -179,26 +179,22 @@ describe('plugin-meetings', () => {
       });
     });
 
-    it('does not clear previous requests and re-request media for non-multistream meetings', async () => {
+    it('does not re-request media for non-multistream meetings', async () => {
       fakeMeeting.isMultistream = false;
       const rm = new ReconnectionManager(fakeMeeting);
 
       await rm.reconnect();
 
-      assert.notCalled(fakeMeeting.mediaRequestManagers.audio.clearPreviousRequests);
-      assert.notCalled(fakeMeeting.mediaRequestManagers.video.clearPreviousRequests);
       assert.notCalled(fakeMeeting.mediaRequestManagers.audio.commit);
       assert.notCalled(fakeMeeting.mediaRequestManagers.video.commit);
     });
 
-    it('does clear previous requests and re-request media for multistream meetings', async () => {
+    it('does re-request media for multistream meetings', async () => {
       fakeMeeting.isMultistream = true;
       const rm = new ReconnectionManager(fakeMeeting);
 
       await rm.reconnect();
 
-      assert.calledOnce(fakeMeeting.mediaRequestManagers.audio.clearPreviousRequests);
-      assert.calledOnce(fakeMeeting.mediaRequestManagers.video.clearPreviousRequests);
       assert.calledOnce(fakeMeeting.mediaRequestManagers.audio.commit);
       assert.calledOnce(fakeMeeting.mediaRequestManagers.video.commit);
     });

package/test/unit/spec/webinar/index.ts

@@ -233,6 +233,8 @@ describe('plugin-meetings', () => {
         // Ensure connect path is eligible
         webinar.selfIsPanelist = true;
         webinar.practiceSessionEnabled = true;
+        webex.internal.voicea.getIsCaptionBoxOn = sinon.stub().returns(false);
+        webex.internal.voicea.updateSubchannelSubscriptions = sinon.stub();
       });
 
       it('no-ops when practice session join eligibility is false', async () => {
@@ -342,6 +344,22 @@ describe('plugin-meetings', () => {
           processRelayEvent
         );
       });
+
+      it('subscribes to transcription when caption intent is enabled', async () => {
+        webex.internal.voicea.getIsCaptionBoxOn = sinon.stub().returns(true);
+
+        await webinar.updatePSDataChannel();
+
+        assert.calledOnceWithExactly(webex.internal.voicea.updateSubchannelSubscriptions, { subscribe: ['transcription'] });
+      });
+
+      it('does not subscribe to transcription when caption intent is disabled', async () => {
+        webex.internal.voicea.getIsCaptionBoxOn = sinon.stub().returns(false);
+
+        await webinar.updatePSDataChannel();
+
+        assert.notCalled(webex.internal.voicea.updateSubchannelSubscriptions);
+      });
       });
 
       describe('#updateStatusByRole', () => {