@webex/plugin-meetings 3.10.0-next.16 → 3.10.0-next.18

package/dist/webinar/index.js

@@ -448,7 +448,7 @@ var Webinar = _webexCore.WebexPlugin.extend({
       }, _callee7);
     }))();
   },
-  version: "3.10.0-next.16"
+  version: "3.10.0-next.18"
 });
 var _default = exports.default = Webinar;
 //# sourceMappingURL=index.js.map

package/package.json

@@ -43,7 +43,7 @@
     "@webex/eslint-config-legacy": "0.0.0",
     "@webex/jest-config-legacy": "0.0.0",
     "@webex/legacy-tools": "0.0.0",
-    "@webex/plugin-rooms": "3.10.0-next.7",
+    "@webex/plugin-rooms": "3.10.0-next.8",
     "@webex/test-helper-chai": "3.10.0-next.1",
     "@webex/test-helper-mocha": "3.10.0-next.1",
     "@webex/test-helper-mock-webex": "3.10.0-next.1",
@@ -63,20 +63,20 @@
     "@webex/common": "3.10.0-next.1",
     "@webex/event-dictionary-ts": "^1.0.1930",
     "@webex/internal-media-core": "2.20.3",
-    "@webex/internal-plugin-conversation": "3.10.0-next.7",
-    "@webex/internal-plugin-device": "3.10.0-next.7",
-    "@webex/internal-plugin-llm": "3.10.0-next.7",
-    "@webex/internal-plugin-mercury": "3.10.0-next.7",
-    "@webex/internal-plugin-metrics": "3.10.0-next.7",
-    "@webex/internal-plugin-support": "3.10.0-next.7",
-    "@webex/internal-plugin-user": "3.10.0-next.7",
-    "@webex/internal-plugin-voicea": "3.10.0-next.9",
+    "@webex/internal-plugin-conversation": "3.10.0-next.8",
+    "@webex/internal-plugin-device": "3.10.0-next.8",
+    "@webex/internal-plugin-llm": "3.10.0-next.8",
+    "@webex/internal-plugin-mercury": "3.10.0-next.8",
+    "@webex/internal-plugin-metrics": "3.10.0-next.8",
+    "@webex/internal-plugin-support": "3.10.0-next.8",
+    "@webex/internal-plugin-user": "3.10.0-next.8",
+    "@webex/internal-plugin-voicea": "3.10.0-next.10",
     "@webex/media-helpers": "3.10.0-next.3",
-    "@webex/plugin-people": "3.10.0-next.7",
-    "@webex/plugin-rooms": "3.10.0-next.7",
+    "@webex/plugin-people": "3.10.0-next.8",
+    "@webex/plugin-rooms": "3.10.0-next.8",
     "@webex/ts-sdp": "^1.8.1",
     "@webex/web-capabilities": "^1.7.1",
-    "@webex/webex-core": "3.10.0-next.7",
+    "@webex/webex-core": "3.10.0-next.8",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",
@@ -93,5 +93,5 @@
   "//": [
     "TODO: upgrade jwt-decode when moving to node 18"
   ],
-  "version": "3.10.0-next.16"
+  "version": "3.10.0-next.18"
 }

package/src/locus-info/index.ts

@@ -18,6 +18,7 @@ import {
   CALL_REMOVED_REASON,
   RECORDING_STATE,
   Enum,
+  SELF_ROLES,
 } from '../constants';
 
 import InfoUtils from './infoUtils';
@@ -512,6 +513,14 @@ export default class LocusInfo extends EventsScope {
   updateLocusFromHashTreeObject(object: HashTreeObject, locus: LocusDTO): LocusDTO {
     const type = object.htMeta.elementId.type.toLowerCase();
 
+    const addParticipantObject = (obj: HashTreeObject) => {
+      if (!locus.participants) {
+        locus.participants = [];
+      }
+      locus.participants.push(obj.data);
+      this.hashTreeObjectId2ParticipantId.set(obj.htMeta.elementId.id, obj.data.id);
+    };
+
     switch (type) {
       case ObjectType.locus: {
         if (!object.data) {
@@ -577,13 +586,7 @@ export default class LocusInfo extends EventsScope {
           } ${object.data ? 'updated' : 'removed'} version=${object.htMeta.elementId.version}`
         );
         if (object.data) {
-          if (!locus.participants) {
-            locus.participants = [];
-          }
-          const participantObject = object.data;
-          participantObject.htMeta = object.htMeta;
-          locus.participants.push(participantObject);
-          this.hashTreeObjectId2ParticipantId.set(object.htMeta.elementId.id, participantObject.id);
+          addParticipantObject(object);
         } else {
           const participantId = this.hashTreeObjectId2ParticipantId.get(object.htMeta.elementId.id);
 
@@ -610,6 +613,24 @@ export default class LocusInfo extends EventsScope {
           );
           const locusDtoKey = ObjectTypeToLocusKeyMap[type];
           locus[locusDtoKey] = object.data;
+
+          /* Hash tree based webinar attendees don't receive a Participant object for themselves from Locus,
+             but a lot of existing code in SDK and web app expects a member object for self to exist,
+             so whenever SELF changes for a webinar attendee, we copy it into a participant object.
+             We can do it, because SELF has always all the same properties as a participant object.
+          */
+          if (
+            type === ObjectType.self &&
+            locus.info?.isWebinar &&
+            object.data.controls?.role?.roles?.find(
+              (r) => r.type === SELF_ROLES.ATTENDEE && r.hasRole
+            )
+          ) {
+            LoggerProxy.logger.info(
+              `Locus-info:index#updateLocusFromHashTreeObject --> webinar attendee: creating participant object from self`
+            );
+            addParticipantObject(object);
+          }
         }
         break;
       default:

package/src/meeting/index.ts

@@ -1,5 +1,5 @@
 import uuid from 'uuid';
-import {cloneDeep, isEqual, isEmpty} from 'lodash';
+import {cloneDeep, isEqual, isEmpty, merge} from 'lodash';
 import jwtDecode from 'jwt-decode';
 // @ts-ignore - Fix this
 import {StatelessWebexPlugin} from '@webex/webex-core';
@@ -50,6 +50,11 @@ import {
   type MeetingTranscriptPayload,
 } from '@webex/internal-plugin-voicea';
 
+import {
+  getBrowserMediaErrorCode,
+  isBrowserMediaError,
+  isBrowserMediaErrorName,
+} from '@webex/internal-plugin-metrics/src/call-diagnostic/call-diagnostic-metrics.util';
 import {processNewCaptions} from './voicea-meeting';
 
 import {
@@ -5440,6 +5445,20 @@ export default class Meeting extends StatelessWebexPlugin {
         shouldRetry = false;
       }
 
+      if (CallDiagnosticUtils.isBrowserMediaError(error)) {
+        shouldRetry = false;
+        // eslint-disable-next-line no-ex-assign
+        error = merge({
+          error: {
+            body: {
+              errorCode: CallDiagnosticUtils.getBrowserMediaErrorCode(error),
+              message: error?.message,
+              name: error?.name,
+            },
+          },
+        });
+      }
+
       // we only want to call leave if join was successful and this was a retry or we won't be doing any more retries
       if (joined && (isRetry || !shouldRetry)) {
         try {

package/test/unit/spec/locus-info/index.js

@@ -358,6 +358,76 @@ describe('plugin-meetings', () => {
           });
         });
 
+        it('should process locus update correctly when called with updated SELF (webinar non-attendee)', () => {
+          const newSelf = {
+            id: 'new-self',
+            visibleDataSets: ['dataset1', 'dataset2'],
+            controls: {
+              role: {
+                roles: [
+                  {type: 'PANELIST', hasRole: true},
+                  {type: 'ATTENDEE', hasRole: false},
+                ],
+              },
+            },
+          };
+          locusInfo.info.isWebinar = true;
+
+          // simulate an update from the HashTreeParser (normally this would be triggered by incoming locus messages)
+          locusInfoUpdateCallback(OBJECTS_UPDATED, {
+            updatedObjects: [{htMeta: {elementId: {type: 'self'}}, data: newSelf}],
+          });
+
+          // check onDeltaLocus() was called with correctly updated locus info
+          // without any participant generated
+          assert.calledOnceWithExactly(onDeltaLocusStub, {
+            ...expectedLocusInfo,
+            info: {
+              ...expectedLocusInfo.info,
+              isWebinar: true,
+            },
+            self: newSelf,
+          });
+        });
+
+        it('should generate a participant when called with updated SELF for webinar attendee', () => {
+          const newSelf = {
+            id: 'new-self',
+            visibleDataSets: ['dataset1', 'dataset2'],
+            controls: {
+              role: {
+                roles: [
+                  {type: 'something else - should be ignored', hasRole: true},
+                  {type: 'ATTENDEE', hasRole: true},
+                ],
+              },
+            },
+          };
+
+          locusInfo.info.isWebinar = true;
+
+          // simulate an update from the HashTreeParser (normally this would be triggered by incoming locus messages)
+          locusInfoUpdateCallback(OBJECTS_UPDATED, {
+            updatedObjects: [{htMeta: {elementId: {type: 'self'}}, data: newSelf}],
+          });
+
+          // check onDeltaLocus() was called with correctly updated locus info
+          // that contains a participant created from self
+          assert.calledOnceWithExactly(onDeltaLocusStub, {
+            ...expectedLocusInfo,
+            info: {
+              ...expectedLocusInfo.info,
+              isWebinar: true,
+            },
+            self: newSelf,
+            participants: [
+              {
+                ...newSelf,
+              },
+            ],
+          });
+        });
+
         it('should process locus update correctly when called with updated fullState', () => {
           const newFullState = {
             id: 'new-fullState',

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

@@ -1003,6 +1003,35 @@ describe('plugin-meetings', () => {
           );
         });
 
+        it('should call leave() if addMediaInternal() fails ', async () => {
+          const addMediaError = new Error('fake addMedia error');
+          addMediaError.name = 'TypeError';
+
+          const rejectError = {
+            error: {
+              body: {
+                errorCode: 2729,
+                message: 'fake addMedia error',
+                name: 'TypeError'
+              }
+            }
+          };
+          meeting.addMediaInternal.rejects(addMediaError);
+          sinon.stub(meeting, 'leave').resolves();
+
+          await assert.isRejected(
+            meeting.joinWithMedia({
+              joinOptions,
+              mediaOptions,
+            }),
+            rejectError
+          );
+
+          assert.calledOnce(meeting.join);
+          assert.calledOnce(meeting.addMediaInternal);
+          assert.calledOnce(Metrics.sendBehavioralMetric);
+        });
+
         it('should not call leave() if addMediaInternal() fails the first time and succeeds the second time and should only call join() once', async () => {
           const addMediaError = new Error('fake addMedia error');
           const leaveStub = sinon.stub(meeting, 'leave');