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

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;
@@ -29,10 +29,7 @@ export default class LocusInfo extends EventsScope {
     aclUrl: any;
     baseSequence: any;
     created: any;
-    identities: any;
-    membership: any;
     participants: any;
-    participantsUrl: any;
     replaces: any;
     scheduledMeeting: any;
     sequence: any;
@@ -44,10 +41,8 @@ export default class LocusInfo extends EventsScope {
     info: any;
     roles: any;
     mediaShares: any;
-    replace: any;
     url: any;
-    services: any;
-    resources: any;
+    links?: Links;
     mainSessionLocusCache: any;
     self: any;
     hashTreeParser?: HashTreeParser;
@@ -278,21 +273,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}
@@ -330,17 +316,11 @@ export default class LocusInfo extends EventsScope {
      */
     updateMediaShares(mediaShares: object, forceUpdate?: boolean): void;
     /**
-     * @param {String} participantsUrl
-     * @returns {undefined}
-     * @memberof LocusInfo
-     */
-    updateParticipantsUrl(participantsUrl: string): void;
-    /**
-     * @param {Object} replace
+     * @param {Object} replaces
      * @returns {undefined}
      * @memberof LocusInfo
      */
-    updateReplace(replace: object): void;
+    updateReplaces(replaces: object): void;
     /**
      * handles when the locus.self is updated
      * @param {Object} self the new locus.self
@@ -375,18 +355,6 @@ export default class LocusInfo extends EventsScope {
      * @memberof LocusInfo
      */
     updateSequence(sequence: number): void;
-    /**
-     * @param {Object} membership
-     * @returns {undefined}
-     * @memberof LocusInfo
-     */
-    updateMemberShip(membership: object): void;
-    /**
-     * @param {Array} identities
-     * @returns {undefined}
-     * @memberof LocusInfo
-     */
-    updateIdentifiers(identities: Array<any>): void;
     /**
      * check the locus is main session's one or not, if is main session's, update main session cache
      * @param {Object} locus

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.3"
 });
 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.3",
+    "@webex/test-helper-chai": "3.10.0-webex-services-ready.2",
+    "@webex/test-helper-mocha": "3.10.0-webex-services-ready.2",
+    "@webex/test-helper-mock-webex": "3.10.0-webex-services-ready.2",
+    "@webex/test-helper-retry": "3.10.0-webex-services-ready.2",
+    "@webex/test-helper-test-users": "3.10.0-webex-services-ready.2",
     "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.2",
     "@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.3",
+    "@webex/internal-plugin-device": "3.10.0-webex-services-ready.3",
+    "@webex/internal-plugin-llm": "3.10.0-webex-services-ready.3",
+    "@webex/internal-plugin-mercury": "3.10.0-webex-services-ready.3",
+    "@webex/internal-plugin-metrics": "3.10.0-webex-services-ready.3",
+    "@webex/internal-plugin-support": "3.10.0-webex-services-ready.3",
+    "@webex/internal-plugin-user": "3.10.0-webex-services-ready.3",
+    "@webex/internal-plugin-voicea": "3.10.0-webex-services-ready.3",
+    "@webex/media-helpers": "3.10.0-webex-services-ready.2",
+    "@webex/plugin-people": "3.10.0-webex-services-ready.3",
+    "@webex/plugin-rooms": "3.10.0-webex-services-ready.3",
     "@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.3",
     "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.3"
 }

package/src/hashTree/hashTree.ts

@@ -1,4 +1,4 @@
-import {XXH3_128} from 'xxh3-ts';
+import {XXH3_128} from 'xxh3-ts/xxh3';
 import {EMPTY_HASH} from './constants';
 import {ObjectType} from './types';
 

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

@@ -18,6 +18,7 @@ import {
   CALL_REMOVED_REASON,
   RECORDING_STATE,
   Enum,
+  SELF_ROLES,
 } from '../constants';
 
 import InfoUtils from './infoUtils';
@@ -38,7 +39,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: {
@@ -96,10 +97,7 @@ export default class LocusInfo extends EventsScope {
   aclUrl: any;
   baseSequence: any;
   created: any;
-  identities: any;
-  membership: any;
   participants: any;
-  participantsUrl: any;
   replaces: any;
   scheduledMeeting: any;
   sequence: any;
@@ -111,10 +109,8 @@ export default class LocusInfo extends EventsScope {
   info: any;
   roles: any;
   mediaShares: any;
-  replace: any;
   url: any;
-  services: any;
-  resources: any;
+  links?: Links;
   mainSessionLocusCache: any;
   self: any;
   hashTreeParser?: HashTreeParser;
@@ -328,13 +324,10 @@ export default class LocusInfo extends EventsScope {
   init(locus: any = {}) {
     this.created = locus.created || null;
     this.scheduledMeeting = locus.meeting || null;
-    this.participantsUrl = locus.participantsUrl || null;
     this.replaces = locus.replaces || null;
     this.aclUrl = locus.aclUrl || null;
     this.baseSequence = locus.baseSequence || null;
     this.sequence = locus.sequence || null;
-    this.membership = locus.membership || null;
-    this.identities = locus.identities || null;
     this.participants = locus.participants || null;
 
     /**
@@ -360,8 +353,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);
   }
 
   /**
@@ -514,6 +506,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) {
@@ -579,13 +579,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);
 
@@ -596,12 +590,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}`
           );
@@ -611,6 +606,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:
@@ -1023,17 +1036,13 @@ export default class LocusInfo extends EventsScope {
     this.updateLocusUrl(locus.url, ControlsUtils.isMainSessionDTO(locus));
     this.updateMeetingInfo(locus.info, locus.self);
     this.updateMediaShares(locus.mediaShares);
-    this.updateParticipantsUrl(locus.participantsUrl);
-    this.updateReplace(locus.replace);
+    this.updateReplaces(locus.replaces);
     this.updateSelf(locus.self);
     this.updateAclUrl(locus.aclUrl);
     this.updateBasequence(locus.baseSequence);
     this.updateSequence(locus.sequence);
-    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 +1694,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 +1714,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 +1727,8 @@ export default class LocusInfo extends EventsScope {
         }
       );
     }
+
+    this.links = links;
   }
 
   /**
@@ -1910,24 +1915,13 @@ export default class LocusInfo extends EventsScope {
   }
 
   /**
-   * @param {String} participantsUrl
-   * @returns {undefined}
-   * @memberof LocusInfo
-   */
-  updateParticipantsUrl(participantsUrl: string) {
-    if (participantsUrl && !isEqual(this.participantsUrl, participantsUrl)) {
-      this.participantsUrl = participantsUrl;
-    }
-  }
-
-  /**
-   * @param {Object} replace
+   * @param {Object} replaces
    * @returns {undefined}
    * @memberof LocusInfo
    */
-  updateReplace(replace: object) {
-    if (replace && !isEqual(this.replace, replace)) {
-      this.replace = replace;
+  updateReplaces(replaces: object) {
+    if (replaces && !isEqual(this.replaces, replaces)) {
+      this.replaces = replaces;
     }
   }
 
@@ -2264,28 +2258,6 @@ export default class LocusInfo extends EventsScope {
     }
   }
 
-  /**
-   * @param {Object} membership
-   * @returns {undefined}
-   * @memberof LocusInfo
-   */
-  updateMemberShip(membership: object) {
-    if (membership && !isEqual(this.membership, membership)) {
-      this.membership = membership;
-    }
-  }
-
-  /**
-   * @param {Array} identities
-   * @returns {undefined}
-   * @memberof LocusInfo
-   */
-  updateIdentifiers(identities: Array<any>) {
-    if (identities && !isEqual(this.identities, identities)) {
-      this.identities = identities;
-    }
-  }
-
   /**
    * check the locus is main session's one or not, if is main session's, update main session cache
    * @param {Object} locus

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 {