@webex/plugin-meetings 3.7.0-next.31 → 3.7.0-next.33

package/dist/types/annotation/index.d.ts

@@ -36,6 +36,11 @@ declare class AnnotationChannel extends WebexPlugin implements IAnnotationChanne
      * @returns {undefined}
      */
     private listenToEvents;
+    /**
+     * Remove event listeners
+     * @returns {undefined}
+     */
+    deregisterEvents(): void;
     /**
      * set locusUrl
      * @param {string} locusUrl

package/dist/webinar/index.js

@@ -458,7 +458,7 @@ var Webinar = _webexCore.WebexPlugin.extend({
       }, _callee7);
     }))();
   },
-  version: "3.7.0-next.31"
+  version: "3.7.0-next.33"
 });
 var _default = exports.default = Webinar;
 //# sourceMappingURL=index.js.map

package/package.json

@@ -43,8 +43,8 @@
     "@webex/eslint-config-legacy": "0.0.0",
     "@webex/jest-config-legacy": "0.0.0",
     "@webex/legacy-tools": "0.0.0",
-    "@webex/plugin-meetings": "3.7.0-next.31",
-    "@webex/plugin-rooms": "3.7.0-next.13",
+    "@webex/plugin-meetings": "3.7.0-next.33",
+    "@webex/plugin-rooms": "3.7.0-next.14",
     "@webex/test-helper-chai": "3.7.0-next.9",
     "@webex/test-helper-mocha": "3.7.0-next.9",
     "@webex/test-helper-mock-webex": "3.7.0-next.9",
@@ -64,17 +64,17 @@
     "@webex/common": "3.7.0-next.9",
     "@webex/event-dictionary-ts": "^1.0.1643",
     "@webex/internal-media-core": "2.12.3",
-    "@webex/internal-plugin-conversation": "3.7.0-next.13",
+    "@webex/internal-plugin-conversation": "3.7.0-next.14",
     "@webex/internal-plugin-device": "3.7.0-next.9",
-    "@webex/internal-plugin-llm": "3.7.0-next.11",
-    "@webex/internal-plugin-mercury": "3.7.0-next.11",
+    "@webex/internal-plugin-llm": "3.7.0-next.12",
+    "@webex/internal-plugin-mercury": "3.7.0-next.12",
     "@webex/internal-plugin-metrics": "3.7.0-next.9",
-    "@webex/internal-plugin-support": "3.7.0-next.14",
+    "@webex/internal-plugin-support": "3.7.0-next.15",
     "@webex/internal-plugin-user": "3.7.0-next.9",
-    "@webex/internal-plugin-voicea": "3.7.0-next.31",
+    "@webex/internal-plugin-voicea": "3.7.0-next.33",
     "@webex/media-helpers": "3.7.0-next.10",
-    "@webex/plugin-people": "3.7.0-next.11",
-    "@webex/plugin-rooms": "3.7.0-next.13",
+    "@webex/plugin-people": "3.7.0-next.12",
+    "@webex/plugin-rooms": "3.7.0-next.14",
     "@webex/web-capabilities": "^1.4.0",
     "@webex/webex-core": "3.7.0-next.9",
     "ampersand-collection": "^2.0.2",
@@ -92,5 +92,5 @@
   "//": [
     "TODO: upgrade jwt-decode when moving to node 18"
   ],
-  "version": "3.7.0-next.31"
+  "version": "3.7.0-next.33"
 }

package/src/annotation/index.ts

@@ -120,6 +120,22 @@ class AnnotationChannel extends WebexPlugin implements IAnnotationChannel {
     }
   }
 
+  /**
+   * Remove event listeners
+   * @returns {undefined}
+   */
+  public deregisterEvents() {
+    if (this.hasSubscribedToEvents) {
+      // @ts-ignore
+      this.webex.internal.mercury.off('event:locus.approval_request', this.eventCommandProcessor);
+
+      // @ts-ignore
+      this.webex.internal.llm.off('event:relay.event', this.eventDataProcessor);
+
+      this.hasSubscribedToEvents = false;
+    }
+  }
+
   /**
    * set locusUrl
    * @param {string} locusUrl

package/src/meeting/index.ts

@@ -5295,7 +5295,16 @@ export default class Meeting extends StatelessWebexPlugin {
           (this.config.receiveReactions || options.receiveReactions) &&
           this.isReactionsSupported()
         ) {
-          const {name} = this.members.membersCollection.get(e.data.sender.participantId);
+          const member = this.members.membersCollection.get(e.data.sender.participantId);
+          if (!member) {
+            // @ts-ignore -- fix type
+            LoggerProxy.logger.warn(
+              `Meeting:index#processRelayEvent --> Skipping handling of ${REACTION_RELAY_TYPES.REACTION} for ${this.id}. participantId ${e.data.sender.participantId} does not exist in membersCollection.`
+            );
+            break;
+          }
+
+          const {name} = member;
           const processedReaction: ProcessedReaction = {
             reaction: e.data.reaction,
             sender: {
@@ -5349,6 +5358,9 @@ export default class Meeting extends StatelessWebexPlugin {
         this.voiceaListenerCallbacks[VOICEAEVENTS.NEW_CAPTION]
       );
 
+      // @ts-ignore
+      this.webex.internal.voicea.deregisterEvents();
+
       this.areVoiceaEventsSetup = false;
       this.triggerStopReceivingTranscriptionEvent();
     }
@@ -8699,6 +8711,11 @@ export default class Meeting extends StatelessWebexPlugin {
       this.stopTranscription();
       this.transcription = undefined;
     }
+
+    this.annotation.deregisterEvents();
+
+    // @ts-ignore - fix types
+    this.webex.internal.llm.off('event:relay.event', this.processRelayEvent);
   };
 
   /**

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

@@ -413,6 +413,51 @@ describe('live-annotation', () => {
         });
       });
     });
-  });
 
+    describe('#deregisterEvents', () => {
+      let llmOn;
+      let llmOff;
+      let mercuryOn;
+      let mercuryOff;
+
+      beforeEach(() => {
+        llmOn = sinon.spy(webex.internal.llm, 'on');
+        llmOff = sinon.spy(webex.internal.llm, 'off');
+        mercuryOn = sinon.spy(webex.internal.mercury, 'on');
+        mercuryOff = sinon.spy(webex.internal.mercury, 'off');
+      });
+
+      it('cleans up events', () => {
+        annotationService.locusUrlUpdate(locusUrl);
+        assert.calledWith(
+          mercuryOn,
+          'event:locus.approval_request',
+          annotationService.eventCommandProcessor,
+          annotationService
+        );
+        assert.calledWith(
+          llmOn,
+          'event:relay.event',
+          annotationService.eventDataProcessor,
+          annotationService
+        );
+        assert.match(annotationService.hasSubscribedToEvents, true);
+
+        annotationService.deregisterEvents();
+        assert.calledWith(llmOff, 'event:relay.event', annotationService.eventDataProcessor);
+        assert.calledWith(
+          mercuryOff,
+          'event:locus.approval_request',
+          annotationService.eventCommandProcessor
+        );
+        assert.match(annotationService.hasSubscribedToEvents, false);
+      });
+
+      it('does not call llm off if events have not been registered', () => {
+        annotationService.deregisterEvents();
+        assert.notCalled(llmOff);
+        assert.notCalled(mercuryOff);
+      });
+    });
+  });
 });

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

@@ -1238,6 +1238,7 @@ describe('plugin-meetings', () => {
           webex.internal.voicea.off = sinon.stub();
           webex.internal.voicea.listenToEvents = sinon.stub();
           webex.internal.voicea.turnOnCaptions = sinon.stub();
+          webex.internal.voicea.deregisterEvents = sinon.stub();
         });
 
         it('should stop listening to voicea events and also trigger a stop event', () => {
@@ -1566,6 +1567,55 @@ describe('plugin-meetings', () => {
             fakeProcessedReaction
           );
         });
+
+        it('should fail quietly if participantId does not exist in membersCollection', () => {
+          LoggerProxy.logger.warn = sinon.stub();
+          meeting.isReactionsSupported = sinon.stub().returns(true);
+          meeting.config.receiveReactions = true;
+          const fakeSendersName = 'Fake reactors name';
+          const fakeReactionPayload = {
+            type: 'fake_type',
+            codepoints: 'fake_codepoints',
+            shortcodes: 'fake_shortcodes',
+            tone: {
+              type: 'fake_tone_type',
+              codepoints: 'fake_tone_codepoints',
+              shortcodes: 'fake_tone_shortcodes',
+            },
+          };
+          const fakeSenderPayload = {
+            participantId: 'fake_participant_id',
+          };
+          const fakeProcessedReaction = {
+            reaction: fakeReactionPayload,
+            sender: {
+              id: fakeSenderPayload.participantId,
+              name: fakeSendersName,
+            },
+          };
+          const fakeRelayEvent = {
+            data: {
+              relayType: REACTION_RELAY_TYPES.REACTION,
+              reaction: fakeReactionPayload,
+              sender: fakeSenderPayload,
+            },
+          };
+          meeting.processRelayEvent(fakeRelayEvent);
+          assert.calledWith(
+            LoggerProxy.logger.warn,
+            `Meeting:index#processRelayEvent --> Skipping handling of react for ${meeting.id}. participantId fake_participant_id does not exist in membersCollection.`
+          );
+          assert.neverCalledWith(
+            TriggerProxy.trigger,
+            sinon.match.instanceOf(Meeting),
+            {
+              file: 'meeting/index',
+              function: 'join',
+            },
+            EVENT_TRIGGERS.MEETING_RECEIVE_REACTIONS,
+            fakeProcessedReaction
+          );
+        });
       });
 
       describe('#handleLLMOnline', () => {
@@ -5055,6 +5105,11 @@ describe('plugin-meetings', () => {
           meeting.logger.error = sinon.stub().returns(true);
           meeting.updateLLMConnection = sinon.stub().returns(Promise.resolve());
           webex.internal.voicea.off = sinon.stub().returns(true);
+          meeting.stopTranscription = sinon.stub();
+          meeting.transcription = {};
+
+          meeting.annotation.deregisterEvents = sinon.stub();
+          webex.internal.llm.off = sinon.stub();
 
           // A meeting needs to be joined to leave
           meeting.meetingState = 'ACTIVE';
@@ -5075,6 +5130,9 @@ describe('plugin-meetings', () => {
           assert.calledOnce(meeting.closePeerConnections);
           assert.calledOnce(meeting.unsetRemoteStreams);
           assert.calledOnce(meeting.unsetPeerConnections);
+          assert.calledOnce(meeting.stopTranscription);
+          assert.calledOnce(meeting.annotation.deregisterEvents);
+          assert.calledWith(webex.internal.llm.off, 'event:relay.event', meeting.processRelayEvent);
         });
 
         it('should reset call diagnostic latencies correctly', async () => {
@@ -6957,6 +7015,9 @@ describe('plugin-meetings', () => {
           meeting.transcription = {};
           meeting.stopTranscription = sinon.stub();
 
+          meeting.annotation.deregisterEvents = sinon.stub();
+          webex.internal.llm.off = sinon.stub();
+
           // A meeting needs to be joined to end
           meeting.meetingState = 'ACTIVE';
           meeting.state = 'JOINED';
@@ -6977,6 +7038,9 @@ describe('plugin-meetings', () => {
           assert.calledOnce(meeting?.unsetRemoteStreams);
           assert.calledOnce(meeting?.unsetPeerConnections);
           assert.calledOnce(meeting?.stopTranscription);
+
+          assert.called(meeting.annotation.deregisterEvents);
+          assert.calledWith(webex.internal.llm.off, 'event:relay.event', meeting.processRelayEvent);
         });
       });