@webex/plugin-meetings 3.10.0-webex-services-ready.1 → 3.10.0-webex-services-ready.2

package/dist/types/hashTree/types.d.ts

@@ -6,9 +6,11 @@ export declare const ObjectType: {
     readonly mediaShare: "mediashare";
     readonly info: "info";
     readonly fullState: "fullstate";
+    readonly links: "links";
 };
 export type ObjectType = Enum<typeof ObjectType>;
 export declare const ObjectTypeToLocusKeyMap: {
+    links: string;
     info: string;
     fullstate: string;
     self: string;

package/dist/types/locus-info/index.d.ts

@@ -1,7 +1,7 @@
 import EventsScope from '../common/events/events-scope';
 import { LOCUSEVENT } from '../constants';
 import HashTreeParser, { DataSet, HashTreeMessage, HashTreeObject } from '../hashTree/hashTreeParser';
-import { LocusDTO } from './types';
+import { Links, LocusDTO } from './types';
 export type LocusLLMEvent = {
     data: {
         eventType: typeof LOCUSEVENT.HASH_TREE_DATA_UPDATED;
@@ -46,8 +46,7 @@ export default class LocusInfo extends EventsScope {
     mediaShares: any;
     replace: any;
     url: any;
-    services: any;
-    resources: any;
+    links?: Links;
     mainSessionLocusCache: any;
     self: any;
     hashTreeParser?: HashTreeParser;
@@ -278,21 +277,12 @@ export default class LocusInfo extends EventsScope {
      */
     updateCreated(created: object): void;
     /**
-     * @param {Object} services
+     * Updates links and emits appropriate events if services or resources have changed
+     * @param {Object} links
      * @returns {undefined}
      * @memberof LocusInfo
      */
-    updateServices(services: Record<'breakout' | 'record', {
-        url: string;
-    }>): void;
-    /**
-     * @param {Object} resources
-     * @returns {undefined}
-     * @memberof LocusInfo
-     */
-    updateResources(resources: Record<'webcastInstance', {
-        url: string;
-    }>): void;
+    updateLinks(links?: Links): void;
     /**
      * @param {Object} fullState
      * @returns {undefined}

package/dist/types/locus-info/types.d.ts

@@ -10,6 +10,14 @@ export type LocusFullState = {
     state: string;
     type: string;
 };
+export type Links = {
+    services: Record<'breakout' | 'record', {
+        url: string;
+    }>;
+    resources: Record<'webcastInstance' | 'visibleDataSets', {
+        url: string;
+    }>;
+};
 export type LocusDTO = {
     controls?: any;
     fullState?: LocusFullState;
@@ -25,7 +33,7 @@ export type LocusDTO = {
     jsSdkMeta?: {
         removedParticipantIds: string[];
     };
-    links?: any;
+    links?: Links;
     mediaShares?: any[];
     meetings?: any[];
     participants: any[];

package/dist/webinar/index.js

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

package/package.json

@@ -43,12 +43,12 @@
     "@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-webex-services-ready.1",
-    "@webex/test-helper-chai": "3.10.0-webex-services-ready.0",
-    "@webex/test-helper-mocha": "3.10.0-webex-services-ready.0",
-    "@webex/test-helper-mock-webex": "3.10.0-webex-services-ready.0",
-    "@webex/test-helper-retry": "3.10.0-webex-services-ready.0",
-    "@webex/test-helper-test-users": "3.10.0-webex-services-ready.0",
+    "@webex/plugin-rooms": "3.10.0-webex-services-ready.2",
+    "@webex/test-helper-chai": "3.10.0-webex-services-ready.1",
+    "@webex/test-helper-mocha": "3.10.0-webex-services-ready.1",
+    "@webex/test-helper-mock-webex": "3.10.0-webex-services-ready.1",
+    "@webex/test-helper-retry": "3.10.0-webex-services-ready.1",
+    "@webex/test-helper-test-users": "3.10.0-webex-services-ready.1",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.24.0",
@@ -60,23 +60,23 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "3.10.0-webex-services-ready.0",
+    "@webex/common": "3.10.0-webex-services-ready.1",
     "@webex/event-dictionary-ts": "^1.0.1930",
     "@webex/internal-media-core": "2.20.3",
-    "@webex/internal-plugin-conversation": "3.10.0-webex-services-ready.1",
-    "@webex/internal-plugin-device": "3.10.0-webex-services-ready.1",
-    "@webex/internal-plugin-llm": "3.10.0-webex-services-ready.1",
-    "@webex/internal-plugin-mercury": "3.10.0-webex-services-ready.1",
-    "@webex/internal-plugin-metrics": "3.10.0-webex-services-ready.1",
-    "@webex/internal-plugin-support": "3.10.0-webex-services-ready.1",
-    "@webex/internal-plugin-user": "3.10.0-webex-services-ready.1",
-    "@webex/internal-plugin-voicea": "3.10.0-webex-services-ready.1",
-    "@webex/media-helpers": "3.10.0-webex-services-ready.0",
-    "@webex/plugin-people": "3.10.0-webex-services-ready.1",
-    "@webex/plugin-rooms": "3.10.0-webex-services-ready.1",
+    "@webex/internal-plugin-conversation": "3.10.0-webex-services-ready.2",
+    "@webex/internal-plugin-device": "3.10.0-webex-services-ready.2",
+    "@webex/internal-plugin-llm": "3.10.0-webex-services-ready.2",
+    "@webex/internal-plugin-mercury": "3.10.0-webex-services-ready.2",
+    "@webex/internal-plugin-metrics": "3.10.0-webex-services-ready.2",
+    "@webex/internal-plugin-support": "3.10.0-webex-services-ready.2",
+    "@webex/internal-plugin-user": "3.10.0-webex-services-ready.2",
+    "@webex/internal-plugin-voicea": "3.10.0-webex-services-ready.2",
+    "@webex/media-helpers": "3.10.0-webex-services-ready.1",
+    "@webex/plugin-people": "3.10.0-webex-services-ready.2",
+    "@webex/plugin-rooms": "3.10.0-webex-services-ready.2",
     "@webex/ts-sdp": "^1.8.1",
     "@webex/web-capabilities": "^1.7.1",
-    "@webex/webex-core": "3.10.0-webex-services-ready.1",
+    "@webex/webex-core": "3.10.0-webex-services-ready.2",
     "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-webex-services-ready.1"
+  "version": "3.10.0-webex-services-ready.2"
 }

package/src/hashTree/types.ts

@@ -8,12 +8,14 @@ export const ObjectType = {
   mediaShare: 'mediashare',
   info: 'info',
   fullState: 'fullstate',
+  links: 'links',
 } as const;
 
 export type ObjectType = Enum<typeof ObjectType>;
 
 // mapping from ObjectType to top level LocusDTO keys
 export const ObjectTypeToLocusKeyMap = {
+  [ObjectType.links]: 'links',
   [ObjectType.info]: 'info',
   [ObjectType.fullState]: 'fullState',
   [ObjectType.self]: 'self',

package/src/locus-info/index.ts

@@ -38,7 +38,7 @@ import HashTreeParser, {
   LocusInfoUpdateType,
 } from '../hashTree/hashTreeParser';
 import {ObjectType, ObjectTypeToLocusKeyMap} from '../hashTree/types';
-import {LocusDTO, LocusFullState} from './types';
+import {Links, LocusDTO, LocusFullState} from './types';
 
 export type LocusLLMEvent = {
   data: {
@@ -113,8 +113,7 @@ export default class LocusInfo extends EventsScope {
   mediaShares: any;
   replace: any;
   url: any;
-  services: any;
-  resources: any;
+  links?: Links;
   mainSessionLocusCache: any;
   self: any;
   hashTreeParser?: HashTreeParser;
@@ -360,8 +359,7 @@ export default class LocusInfo extends EventsScope {
     this.updateSelf(locus.self);
     this.updateHostInfo(locus.host);
     this.updateMediaShares(locus.mediaShares);
-    this.updateServices(locus.links?.services);
-    this.updateResources(locus.links?.resources);
+    this.updateLinks(locus.links);
   }
 
   /**
@@ -596,12 +594,13 @@ export default class LocusInfo extends EventsScope {
           this.hashTreeObjectId2ParticipantId.delete(object.htMeta.elementId.id);
         }
         break;
+      case ObjectType.links:
       case ObjectType.info:
       case ObjectType.fullState:
       case ObjectType.self:
         if (!object.data) {
           // self without data is handled inside HashTreeParser and results in LocusInfoUpdateType.MEETING_ENDED, so we should never get here
-          // other types like info or fullstate - Locus should never send them without data
+          // all other types info, fullstate, etc - Locus should never send them without data
           LoggerProxy.logger.warn(
             `Locus-info:index#updateLocusFromHashTreeObject --> received ${type} object without data, this is not expected! version=${object.htMeta.elementId.version}`
           );
@@ -1032,8 +1031,7 @@ export default class LocusInfo extends EventsScope {
     this.updateMemberShip(locus.membership);
     this.updateIdentifiers(locus.identities);
     this.updateEmbeddedApps(locus.embeddedApps);
-    this.updateServices(locus.links?.services);
-    this.updateResources(locus.links?.resources);
+    this.updateLinks(locus.links);
     this.compareAndUpdate();
     // update which required to compare different objects from locus
   }
@@ -1685,17 +1683,19 @@ export default class LocusInfo extends EventsScope {
   }
 
   /**
-   * @param {Object} services
+   * Updates links and emits appropriate events if services or resources have changed
+   * @param {Object} links
    * @returns {undefined}
    * @memberof LocusInfo
    */
-  updateServices(services: Record<'breakout' | 'record', {url: string}>) {
-    if (services && !isEqual(this.services, services)) {
-      this.services = services;
+  updateLinks(links?: Links) {
+    const {services, resources} = links || {};
+
+    if (services && !isEqual(this.links?.services, services)) {
       this.emitScoped(
         {
           file: 'locus-info',
-          function: 'updateServices',
+          function: 'updateLinks',
         },
         LOCUSINFO.EVENTS.LINKS_SERVICES,
         {
@@ -1703,20 +1703,12 @@ export default class LocusInfo extends EventsScope {
         }
       );
     }
-  }
 
-  /**
-   * @param {Object} resources
-   * @returns {undefined}
-   * @memberof LocusInfo
-   */
-  updateResources(resources: Record<'webcastInstance', {url: string}>) {
-    if (resources && !isEqual(this.resources, resources)) {
-      this.resources = resources;
+    if (resources && !isEqual(this.links?.resources, resources)) {
       this.emitScoped(
         {
           file: 'locus-info',
-          function: 'updateResources',
+          function: 'updateLinks',
         },
         LOCUSINFO.EVENTS.LINKS_RESOURCES,
         {
@@ -1724,6 +1716,8 @@ export default class LocusInfo extends EventsScope {
         }
       );
     }
+
+    this.links = links;
   }
 
   /**

package/src/locus-info/types.ts

@@ -12,6 +12,11 @@ export type LocusFullState = {
   type: string;
 };
 
+export type Links = {
+  services: Record<'breakout' | 'record', {url: string}>; // there exist also other services, but these are the ones we currently use
+  resources: Record<'webcastInstance' | 'visibleDataSets', {url: string}>; // there exist also other resources, but these are the ones we currently use
+};
+
 export type LocusDTO = {
   controls?: any;
   fullState?: LocusFullState;
@@ -27,7 +32,7 @@ export type LocusDTO = {
   jsSdkMeta?: {
     removedParticipantIds: string[]; // list of ids of participants that are removed in the last update
   };
-  links?: any;
+  links?: Links;
   mediaShares?: any[];
   meetings?: any[];
   participants: any[];

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

@@ -394,6 +394,24 @@ describe('plugin-meetings', () => {
           });
         });
 
+        it('should process locus update correctly when called with updated links', () => {
+          const newLinks = {
+            id: 'new-links',
+            visibleDataSets: ['dataset1', 'dataset2'],
+          };
+
+          // simulate an update from the HashTreeParser (normally this would be triggered by incoming locus messages)
+          locusInfoUpdateCallback(OBJECTS_UPDATED, {
+            updatedObjects: [{htMeta: {elementId: {type: 'links'}}, data: newLinks}],
+          });
+
+          // check onDeltaLocus() was called with correctly updated locus info
+          assert.calledOnceWithExactly(onDeltaLocusStub, {
+            ...expectedLocusInfo,
+            links: newLinks,
+          });
+        });
+
         it('should process locus update correctly when called with updated LOCUS object', () => {
           // setup new updated locus that has many things missing
           const newLocusHtMeta = {elementId: {type: 'locus', version: 42}};
@@ -414,6 +432,7 @@ describe('plugin-meetings', () => {
             info: {id: 'fake-info'},
             fullState: {id: 'fake-full-state'},
             self: {id: 'fake-self'},
+            links: { id: 'fake-links' },
             mediaShares: expectedLocusInfo.mediaShares,
             // and now the new fields
             ...newLocus,
@@ -459,6 +478,7 @@ describe('plugin-meetings', () => {
             info: {id: 'fake-info'},
             fullState: {id: 'fake-full-state'},
             self: {id: 'fake-self'},
+            links: { id: 'fake-links' },
             mediaShares: expectedLocusInfo.mediaShares,
             participants: [], // empty means there were no participant updates
             jsSdkMeta: {removedParticipantIds: []}, // no participants were removed
@@ -492,6 +512,7 @@ describe('plugin-meetings', () => {
             info: {id: 'fake-info'},
             fullState: {id: 'fake-full-state'},
             self: {id: 'fake-self'},
+            links: {id: 'fake-links'},
             mediaShares: expectedLocusInfo.mediaShares,
             // and now the new fields
             ...newLocus,
@@ -2771,7 +2792,7 @@ describe('plugin-meetings', () => {
         sinon.stub(locusInfo, "updateMemberShip");
         sinon.stub(locusInfo, "updateIdentifiers");
         sinon.stub(locusInfo, "updateEmbeddedApps");
-        sinon.stub(locusInfo, "updateResources");
+        sinon.stub(locusInfo, "updateLinks");
         sinon.stub(locusInfo, "compareAndUpdate");
 
         locusInfo.updateLocusInfo(locus);
@@ -2805,7 +2826,7 @@ describe('plugin-meetings', () => {
         locusInfo.updateMemberShip = sinon.stub();
         locusInfo.updateIdentifiers = sinon.stub();
         locusInfo.updateEmbeddedApps = sinon.stub();
-        locusInfo.updateResources = sinon.stub();
+        locusInfo.updateLinks = sinon.stub();
         locusInfo.compareAndUpdate = sinon.stub();
 
         locusInfo.updateLocusInfo(newLocus);
@@ -2827,11 +2848,42 @@ describe('plugin-meetings', () => {
         assert.notCalled(locusInfo.updateMemberShip);
         assert.notCalled(locusInfo.updateIdentifiers);
         assert.notCalled(locusInfo.updateEmbeddedApps);
-        assert.notCalled(locusInfo.updateResources);
+        assert.notCalled(locusInfo.updateLinks);
         assert.notCalled(locusInfo.compareAndUpdate);
       });
 
+      it('#updateLocusInfo puts the Locus DTO top level properties at the right place in LocusInfo class', () => {
+        // this test verifies that the top-level properties of Locus DTO are copied
+        // into LocusInfo class and set as top level properties too
+        // this is important, because the code handling Locus hass trees relies on it, see updateFromHashTree()
+        const info = {id: 'info id'};
+        const fullState = {id: 'fullState id'};
+        const links = {services: {id: 'service links'}, resources: {id: 'resource links'}};
+        const self = {id: 'self id'};
+        const mediaShares = [{id: 'fake media share'}];
 
+        sinon.stub(SelfUtils, 'getSelves').returns({
+          current: {},
+          previous: {},
+          updates: {},
+        });
+
+        const newLocus = {
+          info,
+          fullState,
+          links,
+          self,
+          mediaShares,
+        };
+
+        locusInfo.updateLocusInfo(newLocus);
+
+        assert.deepEqual(locusInfo.info, newLocus.info);
+        assert.deepEqual(locusInfo.fullState, newLocus.fullState);
+        assert.deepEqual(locusInfo.links, newLocus.links);
+        assert.deepEqual(locusInfo.self, newLocus.self);
+        assert.deepEqual(locusInfo.mediaShares, newLocus.mediaShares);
+      });
 
       it('onFullLocus() updates the working-copy of locus parser', () => {
         const eventType = 'fakeEvent';

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');