@webex/plugin-meetings 3.0.0-beta.1 → 3.0.0-beta.11

package/src/meeting/{util.js → util.ts}

@@ -19,10 +19,10 @@ import PermissionError from '../common/errors/permission';
 import PasswordError from '../common/errors/password-error';
 import CaptchaError from '../common/errors/captcha-error';
 
-const MeetingUtil = {};
+const MeetingUtil: any = {};
 
 MeetingUtil.parseLocusJoin = (response) => {
-  const parsed = {};
+  const parsed: any = {};
 
   // First todo: add check for existance
   parsed.locus = response.body.locus;
@@ -58,7 +58,8 @@ MeetingUtil.remoteUpdateAudioVideo = (audioMuted, videoMuted, meeting) => {
     selfId: meeting.selfId,
     localMedias,
     deviceUrl: meeting.deviceUrl,
-    correlationId: meeting.correlationId
+    correlationId: meeting.correlationId,
+    preferTranscoding: !meeting.isMultistream,
   }).then((response) => {
     Metrics.postEvent({event: eventType.MEDIA_RESPONSE, meeting});
 
@@ -95,7 +96,7 @@ MeetingUtil.joinMeeting = (meeting, options) => {
       moderator: options.moderator,
       pin: options.pin,
       moveToResource: options.moveToResource,
-      preferTranscoding: options.preferTranscoding,
+      preferTranscoding: !meeting.isMultistream,
       asResourceOccupant: options.asResourceOccupant
     })
     .then((res) => {
@@ -130,8 +131,8 @@ MeetingUtil.cleanUp = (meeting) => {
       meeting.unsetPeerConnections();
       meeting.reconnectionManager.cleanUp();
     })
-    .then(() => meeting.roap.stop(meeting.correlationId, meeting.roapSeq))
-    .then(() => meeting.stopKeepAlive());
+    .then(() => meeting.stopKeepAlive())
+    .then(() => meeting.updateLLMConnection());
 };
 
 MeetingUtil.disconnectPhoneAudio = (meeting, phoneUrl) => {
@@ -168,7 +169,7 @@ MeetingUtil.disconnectPhoneAudio = (meeting, phoneUrl) => {
 // if you explicity want it not to leave on resource id, pass
 // {resourceId: null}
 // TODO: chris, you can modify this however you want
-MeetingUtil.leaveMeeting = (meeting, options = {}) => {
+MeetingUtil.leaveMeeting = (meeting, options: any = {}) => {
   if (meeting.meetingState === FULL_STATE.INACTIVE) {
     // TODO: clean up if the meeting is already inactive
     return Promise.reject(new MeetingNotActiveError());
@@ -237,7 +238,7 @@ MeetingUtil.isMediaEstablished = (currentMediaStatus) =>
   currentMediaStatus && (currentMediaStatus.audio || currentMediaStatus.video || currentMediaStatus.share);
 
 
-MeetingUtil.joinMeetingOptions = (meeting, options = {}) => {
+MeetingUtil.joinMeetingOptions = (meeting, options: any = {}) => {
   meeting.resourceId = meeting.resourceId || options.resourceId;
 
   if (meeting.requiredCaptcha) {
@@ -279,49 +280,6 @@ MeetingUtil.joinMeetingOptions = (meeting, options = {}) => {
     });
 };
 
-MeetingUtil.updateTransceiver = (options, meetingOptions) => {
-  const {
-    type,
-    sendTrack,
-    receiveTrack,
-    track,
-    transceiver,
-    peerConnection,
-    previousMediaDirection
-  } = options;
-
-  if ((sendTrack !== undefined && sendTrack !== previousMediaDirection.sendTrack) ||
-  (receiveTrack !== undefined && receiveTrack !== previousMediaDirection.receiveTrack)) {
-    return Media.updateTransceiver({
-      meetingId: meetingOptions.meeting.id,
-      remoteQualityLevel: meetingOptions.mediaProperties.remoteQualityLevel,
-      enableRtx: meetingOptions.meeting.config.enableRtx,
-      enableExtmap: meetingOptions.meeting.config.enableExtmap
-    }, peerConnection, transceiver,
-    {
-      track,
-      type,
-      receiveTrack,
-      sendTrack
-    })
-      .then(() => meetingOptions.meeting.roap
-        .sendRoapMediaRequest({
-          sdp: meetingOptions.mediaProperties.peerConnection.sdp,
-          roapSeq: meetingOptions.meeting.roapSeq,
-          meeting: meetingOptions.meeting // or can pass meeting ID
-        }))
-      .catch((e) => {
-        LoggerProxy.logger.error(`Meeting:util#updateTransceiver --> Error updating the ${type} streams with error: ${e}`);
-      });
-  } if (track) {
-    transceiver.sender.replaceTrack(track);
-
-    return Promise.resolve();
-  }
-
-  return Promise.reject(new ParameterError('update Failed: please pass valid parameter'));
-};
-
 MeetingUtil.validateOptions = (options) => {
   const {
     sendVideo, sendAudio, sendShare, localStream, localShare

package/src/meeting-info/{collection.js → collection.ts}

@@ -24,12 +24,15 @@ export default class MeetingInfoCollection extends Collection {
    * @public
    * @memberof MeetingInfoCollection
    */
-  get(id) {
+  public get(id: string) {
+    // @ts-ignore
     if (this.meetingInfos[id]) {
+      // @ts-ignore
       return this.meetingInfos[id];
     }
 
     return find(
+      // @ts-ignore
       this.meetingInfos,
       (info) => info.sipUrl === id || info.locusId === id || info.userId === id || info.meetingLink === id
     );

package/src/meeting-info/{index.js → index.ts}

@@ -17,11 +17,15 @@ import MeetingInfoUtil from './util';
  * @class MeetingInfo
  */
 export default class MeetingInfo {
+  meetingInfoCollection: any;
+  meetingInfoRequest: any;
+  webex: any;
+
   /**
    *
    * @param {WebexSDK} webex
    */
-  constructor(webex) {
+  constructor(webex: any) {
     this.webex = webex;
 
     /**
@@ -48,7 +52,7 @@ export default class MeetingInfo {
    * @public
    * @memberof MeetingInfo
    */
-  getMeetingInfo(id) {
+  public getMeetingInfo(id: string) {
     return this.meetingInfoCollection.get(id);
   }
 
@@ -59,7 +63,7 @@ export default class MeetingInfo {
    * @public
    * @memberof MeetingInfo
    */
-  setMeetingInfo(id, info) {
+  public setMeetingInfo(id: string, info: object) {
     this.meetingInfoCollection.set(id, info);
   }
 
@@ -70,7 +74,7 @@ export default class MeetingInfo {
    * @private
    * @memberof MeetingInfo
    */
-  requestFetchInfo(options) {
+  private requestFetchInfo(options: object) {
     return this.meetingInfoRequest.fetchMeetingInfo(options).then((info) => {
       if (info && info.body) {
         this.setMeetingInfo(info.body.sipMeetingUri || info.body.meetingLink, info.body);
@@ -92,7 +96,7 @@ export default class MeetingInfo {
    * @private
    * @memberof MeetingInfo
    */
-  fetchInfoOptions(destination, type) {
+  private fetchInfoOptions(destination: string, type: string) {
     return MeetingInfoUtil.generateOptions({
       destination,
       type,
@@ -108,7 +112,7 @@ export default class MeetingInfo {
    * @public
    * @memberof MeetingInfo
    */
-  fetchMeetingInfo(destination, type = null) {
+  public fetchMeetingInfo(destination: string, type: string = null) {
     if (type === _PERSONAL_ROOM_ && !destination) {
       destination = this.webex.internal.device.userId;
     }

package/src/meeting-info/{meeting-info-v2.js → meeting-info-v2.ts}

@@ -1,5 +1,4 @@
-
-import {HTTP_VERBS, _CONVERSATION_URL_, WBXAPPAPI_SERVICE} from '../constants';
+import { HTTP_VERBS, _CONVERSATION_URL_, WBXAPPAPI_SERVICE } from '../constants';
 import Metrics from '../metrics';
 import BEHAVIORAL_METRICS from '../metrics/constants';
 
@@ -14,6 +13,10 @@ const CAPTCHA_ERROR_REQUIRES_PASSWORD_CODES = [423005, 423006];
  * Error to indicate that wbxappapi requires a password
  */
 export class MeetingInfoV2PasswordError extends Error {
+  meetingInfo: any;
+  sdkMessage: any;
+  wbxAppApiCode: any;
+
   /**
     *
     * @constructor
@@ -21,7 +24,7 @@ export class MeetingInfoV2PasswordError extends Error {
     * @param {Object} [meetingInfo]
     * @param {String} [message]
     */
-  constructor(wbxAppApiErrorCode, meetingInfo, message = PASSWORD_ERROR_DEFAULT_MESSAGE) {
+  constructor(wbxAppApiErrorCode?: number, meetingInfo?: object, message: string = PASSWORD_ERROR_DEFAULT_MESSAGE) {
     super(`${message}, code=${wbxAppApiErrorCode}`);
     this.name = 'MeetingInfoV2PasswordError';
     this.sdkMessage = message;
@@ -35,13 +38,15 @@ export class MeetingInfoV2PasswordError extends Error {
  * Error generating a adhoc space meeting
  */
 export class MeetingInfoV2AdhocMeetingError extends Error {
+  sdkMessage: any;
+  wbxAppApiCode: any;
   /**
     *
     * @constructor
     * @param {Number} [wbxAppApiErrorCode]
     * @param {String} [message]
     */
-  constructor(wbxAppApiErrorCode, message = ADHOC_MEETING_DEFAULT_ERROR) {
+  constructor(wbxAppApiErrorCode?: number, message: string = ADHOC_MEETING_DEFAULT_ERROR) {
     super(`${message}, code=${wbxAppApiErrorCode}`);
     this.name = 'MeetingInfoV2AdhocMeetingError';
     this.sdkMessage = message;
@@ -50,11 +55,14 @@ export class MeetingInfoV2AdhocMeetingError extends Error {
   }
 }
 
-
 /**
    * Error to indicate that preferred webex site not present to start adhoc meeting
    */
 export class MeetingInfoV2CaptchaError extends Error {
+  captchaInfo: any;
+  isPasswordRequired: any;
+  sdkMessage: any;
+  wbxAppApiCode: any;
   /**
     *
     * @constructor
@@ -62,7 +70,7 @@ export class MeetingInfoV2CaptchaError extends Error {
     * @param {Object} [captchaInfo]
     * @param {String} [message]
     */
-  constructor(wbxAppApiErrorCode, captchaInfo, message = CAPTCHA_ERROR_DEFAULT_MESSAGE) {
+  constructor(wbxAppApiErrorCode?: number, captchaInfo?: object, message: string = CAPTCHA_ERROR_DEFAULT_MESSAGE) {
     super(`${message}, code=${wbxAppApiErrorCode}`);
     this.name = 'MeetingInfoV2PasswordError';
     this.sdkMessage = message;
@@ -77,6 +85,8 @@ export class MeetingInfoV2CaptchaError extends Error {
    * @class MeetingInfo
    */
 export default class MeetingInfoV2 {
+  webex: any;
+
   /**
      *
      * @param {WebexSDK} webex
@@ -93,7 +103,7 @@ export default class MeetingInfoV2 {
      * @public
      * @memberof MeetingInfo
      */
-  fetchInfoOptions(destination, type = null) {
+  fetchInfoOptions(destination: string, type: string = null) {
     return MeetingInfoUtil.getDestinationType({
       destination,
       type,
@@ -108,7 +118,7 @@ export default class MeetingInfoV2 {
      * @public
      * @memberof MeetingInfo
      */
-  async createAdhocSpaceMeeting(conversationUrl) {
+  async createAdhocSpaceMeeting(conversationUrl: string) {
     if (!this.webex.meetings.preferredWebexSite) {
       throw Error('No preferred webex site found');
     }
@@ -177,7 +187,15 @@ export default class MeetingInfoV2 {
      * @public
      * @memberof MeetingInfo
      */
-  async fetchMeetingInfo(destination, type = null, password = null, captchaInfo = null) {
+  async fetchMeetingInfo(
+    destination: string,
+    type: string = null,
+    password: string = null,
+    captchaInfo: {
+      code: string;
+      id: string;
+    } = null
+  ) {
     const destinationType = await MeetingInfoUtil.getDestinationType({
       destination,
       type,
@@ -190,7 +208,7 @@ export default class MeetingInfoV2 {
 
     const body = await MeetingInfoUtil.getRequestBody({...destinationType, password, captchaInfo});
 
-    const options = {
+    const options: any = {
       method: HTTP_VERBS.POST,
       body
     };

package/src/meeting-info/{request.js → request.ts}

@@ -2,15 +2,19 @@ import {API} from '../constants';
 import ParameterError from '../common/errors/parameter';
 
 import MeetingInfoUtil from './util';
+
+
 /**
  * @class MeetingInfoRequest
  */
 export default class MeetingInfoRequest {
+  webex: any;
+
   /**
    * Meeting Info Request Constructor
    * @param {WebexSDK} webex
    */
-  constructor(webex) {
+  constructor(webex: any) {
     this.webex = webex;
   }
 
@@ -24,7 +28,7 @@ export default class MeetingInfoRequest {
    * @throws {Error} if the options are not valid and complete
    * @memberof MeetingInfoRequest
    */
-  fetchMeetingInfo(options) {
+  fetchMeetingInfo(options: any) {
     if (!options || !options.type || !options.destination) {
       throw new ParameterError('MeetingInfo should be fetched with a type and destination specified, see list of valid types and their corresponding values in constants');
     }

package/src/meeting-info/{util.js → util.ts}

@@ -2,6 +2,7 @@ import url from 'url';
 
 import btoa from 'btoa';
 import {
+  // @ts-ignore
   deconstructHydraId
 } from '@webex/common';
 
@@ -33,7 +34,7 @@ import {
   UUID_REG
 } from '../constants';
 
-const MeetingInfoUtil = {};
+const MeetingInfoUtil: any = {};
 
 MeetingInfoUtil.extractDestination = (destination, type) => {
   let dest = destination;
@@ -74,7 +75,7 @@ MeetingInfoUtil.getParsedUrl = (link) => {
  * @param {String} value  string to parse and see if it matches a meeting link
  * @returns {Boolean}
  */
-MeetingInfoUtil.isMeetingLink = (value) => {
+MeetingInfoUtil.isMeetingLink = (value: string) => {
   const parsedUrl = MeetingInfoUtil.getParsedUrl(value);
   const hostNameBool = parsedUrl.hostname && parsedUrl.hostname.includes(WEBEX_DOT_COM);
   const pathNameBool = parsedUrl.pathname && (parsedUrl.pathname.includes(`/${MEET}`) || parsedUrl.pathname.includes(`/${MEET_M}`) || parsedUrl.pathname.includes(`/${JOIN}`));
@@ -173,7 +174,7 @@ MeetingInfoUtil.generateOptions = async (from) => {
       type
     };
   }
-  const options = {};
+  const options: any = {};
   const hydraId = MeetingInfoUtil.getHydraId(destination);
 
   if (MeetingInfoUtil.isMeetingLink(destination)) {
@@ -238,7 +239,7 @@ MeetingInfoUtil.generateOptions = async (from) => {
  * @param {Object} value ?? value.value
  * @returns {Object} returns an object with {resource, method}
  */
-MeetingInfoUtil.getResourceUrl = (type, value) => {
+MeetingInfoUtil.getResourceUrl = (type: string, value: any) => {
   let resource = `/${LOCI}/${MEETINGINFO}`;
   let method = HTTP_VERBS.GET;
   let uri = null;
@@ -270,7 +271,7 @@ MeetingInfoUtil.getResourceUrl = (type, value) => {
 };
 
 MeetingInfoUtil.getRequestParams = (resourceOptions, type, value, api) => {
-  let requestParams = {
+  let requestParams: any = {
     method: resourceOptions.method,
     api,
     resource: resourceOptions.resource

package/src/meeting-info/{utilv2.js → utilv2.ts}

@@ -1,6 +1,7 @@
 import url from 'url';
 
 import {
+  // @ts-ignore
   deconstructHydraId
 } from '@webex/common';
 
@@ -27,7 +28,7 @@ import {
 import ParameterError from '../common/errors/parameter';
 import LoggerProxy from '../common/logs/logger-proxy';
 
-const MeetingInfoUtil = {};
+const MeetingInfoUtil: any = {};
 
 MeetingInfoUtil.getParsedUrl = (link) => {
   try {
@@ -55,7 +56,7 @@ MeetingInfoUtil.getParsedUrl = (link) => {
  * @param {String} value  string to parse and see if it matches a meeting link
  * @returns {Boolean}
  */
-MeetingInfoUtil.isMeetingLink = (value) => {
+MeetingInfoUtil.isMeetingLink = (value: string) => {
   const parsedUrl = MeetingInfoUtil.getParsedUrl(value);
   const hostNameBool = parsedUrl.hostname && parsedUrl.hostname.includes(WEBEX_DOT_COM);
   const pathNameBool = parsedUrl.pathname && (parsedUrl.pathname.includes(`/${MEET}`) || parsedUrl.pathname.includes(`/${MEET_M}`) || parsedUrl.pathname.includes(`/${JOIN}`));
@@ -144,7 +145,7 @@ MeetingInfoUtil.getDestinationType = async (from) => {
       type
     };
   }
-  const options = {};
+  const options: any = {};
   const hydraId = MeetingInfoUtil.getHydraId(destination);
 
   if (MeetingInfoUtil.isMeetingLink(destination)) {
@@ -211,11 +212,11 @@ MeetingInfoUtil.getDestinationType = async (from) => {
  * @param {Object} options.destination ?? value.value
  * @returns {Object} returns an object with {resource, method}
  */
-MeetingInfoUtil.getRequestBody = (options) => {
+MeetingInfoUtil.getRequestBody = (options: { type: string; destination: object } | any) => {
   const {
     type, destination, password, captchaInfo
   } = options;
-  const body = {
+  const body: any = {
     supportHostKey: true,
     supportCountryList: true,
   };
@@ -270,7 +271,7 @@ MeetingInfoUtil.getRequestBody = (options) => {
  * @param {String} uri string (e.g. '10019857020@convergedats.webex.com')
  * @returns {String} the site/host part of the URI string (e.g. 'convergedats.webex.com')
  */
-MeetingInfoUtil.getWebexSite = (uri) => {
+MeetingInfoUtil.getWebexSite = (uri: string) => {
   const exceptedDomains = ['meet.webex.com', 'meetup.webex.com', 'ciscospark.com'];
   const site = uri?.match(/.+@([^.]+\.[^.]+\.[^.]+)$/)?.[1];
 
@@ -284,7 +285,7 @@ MeetingInfoUtil.getWebexSite = (uri) => {
  * @param {Object} options.destination ?? value.value
  * @returns {String} returns a URI string or null of there is no direct URI
  */
-MeetingInfoUtil.getDirectMeetingInfoURI = (options) => {
+MeetingInfoUtil.getDirectMeetingInfoURI = (options: { type: string; destination: any }) => {
   const {
     type, destination
   } = options;

package/src/meetings/{collection.js → collection.ts}

@@ -1,6 +1,7 @@
 import {find} from 'lodash';
 
 import Collection from '../common/collection';
+
 /**
  * @export
  * @class MeetingCollection
@@ -16,12 +17,13 @@ export default class MeetingCollection extends Collection {
   }
 
   set(meeting) {
+    // @ts-ignore
     this.meetings[meeting.id] = meeting;
 
+    // @ts-ignore
     return this.meetings[meeting.id];
   }
 
-
   /**
    * get a specific meeting searching for key
    * @param {String} key
@@ -30,8 +32,9 @@ export default class MeetingCollection extends Collection {
    * @public
    * @memberof MeetingCollection
    */
-  getByKey(key, value) {
+  public getByKey(key: string, value: any) {
     if (key && value) {
+      // @ts-ignore
       return find(this.meetings, (meeting) => (meeting[key] === value));
     }