@webex/plugin-meetings 2.60.1-next.9 → 2.60.2

package/src/members/index.ts

@@ -17,19 +17,17 @@ import Trigger from '../common/events/trigger-proxy';
 import Member from '../member';
 import LoggerProxy from '../common/logs/logger-proxy';
 import ParameterError from '../common/errors/parameter';
-import {
-  ReclaimHostEmptyWrongKeyError,
-  ReclaimHostIsHostAlreadyError,
-  ReclaimHostNotAllowedError,
-  ReclaimHostNotSupportedError,
-} from '../common/errors/reclaim-host-role-errors';
 
 import MembersCollection from './collection';
 import MembersRequest from './request';
 import MembersUtil from './util';
-import {ReceiveSlotManager} from '../multistream/receiveSlotManager';
-import {MediaRequestManager} from '../multistream/mediaRequestManager';
 import {ServerRoleShape} from './types';
+import {
+  ReclaimHostEmptyWrongKeyError,
+  ReclaimHostIsHostAlreadyError,
+  ReclaimHostNotAllowedError,
+  ReclaimHostNotSupportedError,
+} from '../common/errors/reclaim-host-role-error';
 
 /**
  * Members Update Event
@@ -83,12 +81,6 @@ export default class Members extends StatelessWebexPlugin {
   mediaShareWhiteboardId: any;
   membersCollection: any;
   membersRequest: any;
-  receiveSlotManager: ReceiveSlotManager;
-  mediaRequestManagers: {
-    audio: MediaRequestManager;
-    video: MediaRequestManager;
-  };
-
   recordingId: any;
   selfId: any;
   type: any;
@@ -110,14 +102,8 @@ export default class Members extends StatelessWebexPlugin {
      * @private
      * @memberof Members
      */
-
     // @ts-ignore
-    this.membersRequest = new MembersRequest(
-      {
-        meeting: attrs.meeting,
-      },
-      options
-    );
+    this.membersRequest = new MembersRequest({}, options);
     /**
      * The Members Collection cache
      * @instance
@@ -188,18 +174,6 @@ export default class Members extends StatelessWebexPlugin {
      * @memberof Members
      */
     this.recordingId = null;
-
-    /**
-     * reference to a ReceiveSlotManager instance (for multistream)
-     * @private
-     */
-    this.receiveSlotManager = attrs.receiveSlotManager;
-
-    /**
-     * reference to a MediaRequestManager instance that manages main video requests (for multistream)
-     * @private
-     */
-    this.mediaRequestManagers = attrs.mediaRequestManagers;
   }
 
   /**
@@ -302,25 +276,6 @@ export default class Members extends StatelessWebexPlugin {
     );
   }
 
-  /**
-   * clear member collection
-   * @returns {void}
-   * @private
-   * @memberof Members
-   */
-  clearMembers() {
-    this.membersCollection.reset();
-    Trigger.trigger(
-      this,
-      {
-        file: 'members',
-        function: 'clearMembers',
-      },
-      EVENT_TRIGGERS.MEMBERS_CLEAR,
-      {}
-    );
-  }
-
   /**
    * when new participant updates come in, both delta and full participants, update them in members collection
    * delta object in the event will have {updated, added} and full will be the full membersCollection
@@ -330,16 +285,11 @@ export default class Members extends StatelessWebexPlugin {
    * @private
    * @memberof Members
    */
-  locusParticipantsUpdate(payload: {participants: object; isReplace?: boolean}) {
+  locusParticipantsUpdate(payload: {participants: object}) {
     if (payload) {
-      if (payload.isReplace) {
-        this.clearMembers();
-      }
       const delta = this.handleLocusInfoUpdatedParticipants(payload);
       const full = this.handleMembersUpdate(delta); // SDK should propagate the full list for both delta and non delta updates
 
-      this.receiveSlotManager?.updateMemberIds();
-
       Trigger.trigger(
         this,
         {
@@ -350,7 +300,6 @@ export default class Members extends StatelessWebexPlugin {
         {
           delta,
           full,
-          isReplace: !!payload.isReplace,
         }
       );
     }
@@ -751,6 +700,46 @@ export default class Members extends StatelessWebexPlugin {
     return this.membersRequest.addMembers(options);
   }
 
+  /**
+   * Assign role(s) to a member in the meeting
+   * @param {String} memberId
+   * @param {[ServerRoleShape]} roles - to assign an array of roles
+   * @returns {Promise}
+   * @public
+   * @memberof Members
+   */
+  public assignRoles(memberId: string, roles: Array<ServerRoleShape>) {
+    if (!this.locusUrl) {
+      return Promise.reject(
+        new ParameterError(
+          'The associated locus url for this meetings members object must be defined.'
+        )
+      );
+    }
+    if (!memberId) {
+      return Promise.reject(
+        new ParameterError('The member id must be defined to assign the roles to a member.')
+      );
+    }
+    const options = MembersUtil.generateRoleAssignmentMemberOptions(memberId, roles, this.locusUrl);
+
+    return this.membersRequest.assignRolesMember(options).catch((error: any) => {
+      const errorCode = error.body?.errorCode;
+      switch (errorCode) {
+        case ASSIGN_ROLES_ERROR_CODES.ReclaimHostNotSupportedErrorCode:
+          return Promise.reject(new ReclaimHostNotSupportedError());
+        case ASSIGN_ROLES_ERROR_CODES.ReclaimHostNotAllowedErrorCode:
+          return Promise.reject(new ReclaimHostNotAllowedError());
+        case ASSIGN_ROLES_ERROR_CODES.ReclaimHostEmptyWrongKeyErrorCode:
+          return Promise.reject(new ReclaimHostEmptyWrongKeyError());
+        case ASSIGN_ROLES_ERROR_CODES.ReclaimHostIsHostAlreadyErrorCode:
+          return Promise.reject(new ReclaimHostIsHostAlreadyError());
+        default:
+          return Promise.reject(error);
+      }
+    });
+  }
+
   /**
    * Cancels an outgoing PSTN call to the associated meeting
    * @param {String} invitee
@@ -776,22 +765,15 @@ export default class Members extends StatelessWebexPlugin {
   /**
    * Admits waiting members (invited guests to meeting)
    * @param {Array} memberIds
-   * @param {Object} sessionLocusUrls: {authorizingLocusUrl, mainLocusUrl}
    * @returns {Promise}
    * @public
    * @memberof Members
    */
-  public admitMembers(
-    memberIds: Array<any>,
-    sessionLocusUrls?: {authorizingLocusUrl: string; mainLocusUrl: string}
-  ) {
+  public admitMembers(memberIds: Array<any>) {
     if (isEmpty(memberIds)) {
       return Promise.reject(new ParameterError('No member ids provided to admit.'));
     }
-    const options = {
-      sessionLocusUrls,
-      ...MembersUtil.generateAdmitMemberOptions(memberIds, this.locusUrl),
-    };
+    const options = MembersUtil.generateAdmitMemberOptions(memberIds, this.locusUrl);
 
     return this.membersRequest.admitMember(options);
   }
@@ -823,12 +805,11 @@ export default class Members extends StatelessWebexPlugin {
    * Audio mutes another member in a meeting
    * @param {String} memberId
    * @param {boolean} [mute] default true
-   * @param {boolean} [isAudio] default true
    * @returns {Promise}
    * @public
    * @memberof Members
    */
-  public muteMember(memberId: string, mute = true, isAudio = true) {
+  public muteMember(memberId: string, mute = true) {
     if (!this.locusUrl) {
       return Promise.reject(
         new ParameterError(
@@ -841,51 +822,11 @@ export default class Members extends StatelessWebexPlugin {
         new ParameterError('The member id must be defined to mute the member.')
       );
     }
-    const options = MembersUtil.generateMuteMemberOptions(memberId, mute, this.locusUrl, isAudio);
+    const options = MembersUtil.generateMuteMemberOptions(memberId, mute, this.locusUrl);
 
     return this.membersRequest.muteMember(options);
   }
 
-  /**
-   * Assign role(s) to a member in the meeting
-   * @param {String} memberId
-   * @param {[ServerRoleShape]} roles - to assign an array of roles
-   * @returns {Promise}
-   * @public
-   * @memberof Members
-   */
-  public assignRoles(memberId: string, roles: Array<ServerRoleShape>) {
-    if (!this.locusUrl) {
-      return Promise.reject(
-        new ParameterError(
-          'The associated locus url for this meetings members object must be defined.'
-        )
-      );
-    }
-    if (!memberId) {
-      return Promise.reject(
-        new ParameterError('The member id must be defined to assign the roles to a member.')
-      );
-    }
-    const options = MembersUtil.generateRoleAssignmentMemberOptions(memberId, roles, this.locusUrl);
-
-    return this.membersRequest.assignRolesMember(options).catch((error: any) => {
-      const errorCode = error.body?.errorCode;
-      switch (errorCode) {
-        case ASSIGN_ROLES_ERROR_CODES.ReclaimHostNotSupportedErrorCode:
-          return Promise.reject(new ReclaimHostNotSupportedError());
-        case ASSIGN_ROLES_ERROR_CODES.ReclaimHostNotAllowedErrorCode:
-          return Promise.reject(new ReclaimHostNotAllowedError());
-        case ASSIGN_ROLES_ERROR_CODES.ReclaimHostEmptyWrongKeyErrorCode:
-          return Promise.reject(new ReclaimHostEmptyWrongKeyError());
-        case ASSIGN_ROLES_ERROR_CODES.ReclaimHostIsHostAlreadyErrorCode:
-          return Promise.reject(new ReclaimHostIsHostAlreadyError());
-        default:
-          return Promise.reject(error);
-      }
-    });
-  }
-
   /**
    * Raise or lower the hand of a member in a meeting
    * @param {String} memberId
@@ -1010,80 +951,4 @@ export default class Members extends StatelessWebexPlugin {
       )
     );
   }
-
-  /** Finds a member that has any device with a csi matching provided value
-   *
-   * @param {number} csi
-   * @returns {Member}
-   */
-  findMemberByCsi(csi) {
-    return Object.values(this.membersCollection.getAll()).find((member) =>
-      // @ts-ignore
-      member.participant?.devices?.find((device) =>
-        device.csis?.find((memberCsi) => memberCsi === csi)
-      )
-    );
-  }
-
-  /**
-   * Returns an array of a member's CSIs matching the mediaType and mediaContent
-   *
-   * @param {string} memberId
-   * @param {string} mediaType 'audio' or 'video'
-   * @param {string} mediaContent 'main' or 'slides'
-   * @returns {Member}
-   */
-  getCsisForMember(memberId, mediaType = 'video', mediaContent = 'main') {
-    const csis = [];
-
-    this.membersCollection.get(memberId)?.participant?.devices?.forEach((device) => {
-      if (device.mediaSessions) {
-        const deviceCsis = device.mediaSessions
-          ?.filter(
-            (mediaSession) =>
-              mediaSession.mediaType === mediaType && mediaSession.mediaContent === mediaContent
-          )
-          .map((mediaSession) => mediaSession.csi);
-
-        csis.push(...deviceCsis);
-      }
-    });
-
-    return csis;
-  }
-
-  /**
-   * Edit display name of participants in a meeting
-   * @param {string} memberId - id of the participant who is receiving request
-   * @param {string} requestingParticipantId - id of the participant who is sending request (optional)
-   * @param {string} [alias] - alias name
-   * @returns {Promise}
-   * @public
-   * @memberof Members
-   */
-  public editDisplayName(memberId: string, requestingParticipantId: string, alias: string) {
-    if (!this.locusUrl) {
-      return Promise.reject(
-        new ParameterError(
-          'The associated locus url for this meetings members object must be defined.'
-        )
-      );
-    }
-    if (!memberId) {
-      return Promise.reject(
-        new ParameterError('The member id must be defined to edit display name of the member.')
-      );
-    }
-
-    const {locusUrl} = this;
-
-    const options = MembersUtil.generateEditDisplayNameMemberOptions(
-      memberId,
-      requestingParticipantId,
-      alias,
-      locusUrl
-    );
-
-    return this.membersRequest.editDisplayNameMember(options);
-  }
 }

package/src/members/request.ts

@@ -5,26 +5,12 @@ import {MEETINGS} from '../constants';
 import ParameterError from '../common/errors/parameter';
 
 import MembersUtil from './util';
-import MeetingUtil from '../meeting/util';
 
 /**
  * @class MembersRequest
  */
 export default class MembersRequest extends StatelessWebexPlugin {
   namespace = MEETINGS;
-  locusDeltaRequest: (options: object) => Promise<any>;
-
-  /**
-   * Constructor
-   * @param {Object} attrs
-   * @param {Object} options
-   */
-  constructor(attrs: {meeting: any}, options: object) {
-    const {meeting, ...otherAttrs} = attrs;
-    super(otherAttrs, options);
-
-    this.locusDeltaRequest = MeetingUtil.generateLocusDeltaRequest(meeting);
-  }
 
   /**
    *
@@ -50,7 +36,8 @@ export default class MembersRequest extends StatelessWebexPlugin {
     }
     const requestParams = MembersUtil.getAddMemberRequestParams(options);
 
-    return this.locusDeltaRequest(requestParams);
+    // @ts-ignore
+    return this.request(requestParams);
   }
 
   /**
@@ -68,74 +55,56 @@ export default class MembersRequest extends StatelessWebexPlugin {
     }
     const requestParams = MembersUtil.getAdmitMemberRequestParams(options);
 
-    return this.locusDeltaRequest(requestParams);
+    // @ts-ignore
+    return this.request(requestParams);
   }
 
   /**
-   * Sends a request to remove a member
+   * Sends a request to assign roles to a member
    * @param {Object} options
    * @param {String} options.locusUrl
-   * @param {String} options.memberId ID of member
+   * @param {String} options.memberId ID of PSTN user
    * @returns {Promise}
    */
-  removeMember(options) {
+  assignRolesMember(options: any) {
     if (!options || !options.locusUrl || !options.memberId) {
       throw new ParameterError(
         'memberId must be defined, and the associated locus url for this meeting object must be defined.'
       );
     }
 
-    const requestParams = MembersUtil.getRemoveMemberRequestParams(options);
+    const requestParams = MembersUtil.getRoleAssignmentMemberRequestParams(options);
 
-    return this.locusDeltaRequest(requestParams);
+    // @ts-ignore
+    return this.request(requestParams);
   }
 
-  /**
-   * Sends a request to mute a member
-   * @param {Object} options
-   * @param {String} options.locusUrl
-   * @param {String} options.memberId ID of member
-   * @returns {Promise}
-   */
-  muteMember(options) {
+  removeMember(options) {
     if (!options || !options.locusUrl || !options.memberId) {
       throw new ParameterError(
         'memberId must be defined, and the associated locus url for this meeting object must be defined.'
       );
     }
 
-    const requestParams = MembersUtil.getMuteMemberRequestParams(options);
+    const requestParams = MembersUtil.getRemoveMemberRequestParams(options);
 
     // @ts-ignore
-    return this.locusDeltaRequest(requestParams);
+    return this.request(requestParams);
   }
 
-  /**
-   * Sends a request to the DTMF endpoint to send tones
-   * @param {Object} options
-   * @param {String} options.locusUrl
-   * @param {String} options.memberId ID of PSTN user
-   * @returns {Promise}
-   */
-  assignRolesMember(options: any) {
+  muteMember(options) {
     if (!options || !options.locusUrl || !options.memberId) {
       throw new ParameterError(
         'memberId must be defined, and the associated locus url for this meeting object must be defined.'
       );
     }
 
-    const requestParams = MembersUtil.getRoleAssignmentMemberRequestParams(options);
+    const requestParams = MembersUtil.getMuteMemberRequestParams(options);
 
-    return this.locusDeltaRequest(requestParams);
+    // @ts-ignore
+    return this.request(requestParams);
   }
 
-  /**
-   * Sends a request to raise or lower a member's hand
-   * @param {Object} options
-   * @param {String} options.locusUrl
-   * @param {String} options.memberId ID of member
-   * @returns {Promise}
-   */
   raiseOrLowerHandMember(options) {
     if (!options || !options.locusUrl || !options.memberId) {
       throw new ParameterError(
@@ -145,16 +114,10 @@ export default class MembersRequest extends StatelessWebexPlugin {
 
     const requestParams = MembersUtil.getRaiseHandMemberRequestParams(options);
 
-    return this.locusDeltaRequest(requestParams);
+    // @ts-ignore
+    return this.request(requestParams);
   }
 
-  /**
-   * Sends a request to lower all hands
-   * @param {Object} options
-   * @param {String} options.locusUrl
-   * @param {String} options.requestingParticipantId ID of requesting participant
-   * @returns {Promise}
-   */
   lowerAllHandsMember(options) {
     if (!options || !options.locusUrl || !options.requestingParticipantId) {
       throw new ParameterError(
@@ -164,36 +127,10 @@ export default class MembersRequest extends StatelessWebexPlugin {
 
     const requestParams = MembersUtil.getLowerAllHandsMemberRequestParams(options);
 
-    return this.locusDeltaRequest(requestParams);
-  }
-
-  /**
-   *
-   * @param {Object} options with format of {locusUrl: string, requestingParticipantId: string}
-   * @returns {Promise}
-   * @throws {Error} if the options are not valid and complete, must have requestingParticipantId AND locusUrl
-   * @memberof MembersRequest
-   */
-  editDisplayNameMember(options: {locusUrl: string; requestingParticipantId: string}) {
-    if (!options || !options.locusUrl || !options.requestingParticipantId) {
-      throw new ParameterError(
-        'requestingParticipantId must be defined, and the associated locus url for this meeting object must be defined.'
-      );
-    }
-
-    const requestParams = MembersUtil.editDisplayNameMemberRequestParams(options);
-
-    return this.locusDeltaRequest(requestParams);
+    // @ts-ignore
+    return this.request(requestParams);
   }
 
-  /**
-   * Sends a request to raise or lower a member's hand
-   * @param {Object} options
-   * @param {String} options.locusUrl
-   * @param {String} options.memberId ID of member
-   * @param {String} options.moderator ID of moderator
-   * @returns {Promise}
-   */
   transferHostToMember(options) {
     if (!options || !options.locusUrl || !options.memberId || !options.moderator) {
       throw new ParameterError(
@@ -203,7 +140,8 @@ export default class MembersRequest extends StatelessWebexPlugin {
 
     const requestParams = MembersUtil.getTransferHostToMemberRequestParams(options);
 
-    return this.locusDeltaRequest(requestParams);
+    // @ts-ignore
+    return this.request(requestParams);
   }
 
   /**
@@ -232,7 +170,8 @@ export default class MembersRequest extends StatelessWebexPlugin {
 
     const requestParams = MembersUtil.generateSendDTMFRequestParams(options);
 
-    return this.locusDeltaRequest(requestParams);
+    // @ts-ignore
+    return this.request(requestParams);
   }
 
   /**
@@ -250,6 +189,7 @@ export default class MembersRequest extends StatelessWebexPlugin {
 
     const requestParams = MembersUtil.generateCancelInviteRequestParams(options);
 
-    return this.locusDeltaRequest(requestParams);
+    // @ts-ignore
+    return this.request(requestParams);
   }
 }