@webex/plugin-meetings 2.35.3 → 2.35.4

package/src/reachability/request.ts

@@ -20,12 +20,14 @@ export type ClusterList = {
  * @class ReachabilityRequest
  */
 class ReachabilityRequest {
+  webex: any;
+
   /**
    * Creates an instance of ReachabilityRequest.
    * @param {object} webex
    * @memberof ReachabilityRequest
    */
-  constructor(webex) {
+  constructor(webex: object) {
     this.webex = webex;
   }
 
@@ -58,7 +60,7 @@ class ReachabilityRequest {
    * @param {Object} localSDPList localSDPs for the cluster
    * @returns {Object}
    */
-  remoteSDPForClusters = (localSDPList) => this.webex.request({
+  remoteSDPForClusters = (localSDPList: object) => this.webex.request({
     method: HTTP_VERBS.POST,
     shouldRefreshAccessToken: false,
     api: API.CALLIOPEDISCOVERY,

package/src/reconnection-manager/{index.js → index.ts}

@@ -23,6 +23,7 @@ import {eventType, reconnection, errorObjects} from '../metrics/config';
 import Media from '../media';
 import Metrics from '../metrics';
 import RoapCollection from '../roap/collection';
+import Meeting from '../meeting';
 
 /**
  * Used to indicate that the reconnect logic needs to be retried.
@@ -39,6 +40,8 @@ class NeedsRetryError extends Error {}
  * @extends {Error}
  */
 class NeedsRejoinError extends Error {
+  wasSharing: any;
+
   /**
    * Creates an instance of NeedsRejoinError.
    * @param {Object} params
@@ -46,7 +49,14 @@ class NeedsRejoinError extends Error {
    * @param {Error} params.error
    * @memberof NeedsRejoinError
    */
-  constructor({wasSharing, error = new Error('Meeting needs to be rejoined')}) {
+  constructor({
+    wasSharing,
+    error = new Error('Meeting needs to be rejoined'),
+  }: {
+    wasSharing?: boolean;
+    error?: Error;
+  }) {
+    // @ts-ignore
     super(error);
 
     this.wasSharing = wasSharing;
@@ -58,10 +68,19 @@ class NeedsRejoinError extends Error {
  * @class ReconnectionManager
 */
 export default class ReconnectionManager {
+  autoRejoinEnabled: any;
+  iceState: any;
+  maxRejoinAttempts: any;
+  meeting: any;
+  rejoinAttempts: any;
+  shareStatus: any;
+  status: any;
+  tryCount: any;
+  webex: any;
   /**
    * @param {Meeting} meeting
    */
-  constructor(meeting) {
+  constructor(meeting: Meeting) {
     /**
      * Stores ICE reconnection state data.
      *
@@ -74,6 +93,7 @@ export default class ReconnectionManager {
       disconnected: false,
       resolve: () => {},
       timer: undefined,
+      // @ts-ignore
       timeoutDuration: meeting.config.reconnection.iceReconnectionTimeout
     };
 
@@ -99,6 +119,7 @@ export default class ReconnectionManager {
     */
     // TODO : change this logic to not save the meeting instance
     // It gets complicated when meeting ends on remote side , We have a old meeting instance which is not up to date
+    // @ts-ignore
     this.webex = meeting.webex;
     /**
      * @instance
@@ -110,8 +131,10 @@ export default class ReconnectionManager {
     // try moving this to meetings collection
     this.meeting = meeting;
 
+    // @ts-ignore
     this.maxRejoinAttempts = meeting.config.reconnection.maxRejoinAttempts;
     this.rejoinAttempts = RECONNECTION.STATE.DEFAULT_TRY_COUNT;
+    // @ts-ignore
     this.autoRejoinEnabled = meeting.config.reconnection.autoRejoin;
 
 
@@ -127,7 +150,7 @@ export default class ReconnectionManager {
    * @public
    * @memberof ReconnectionManager
    */
-  iceReconnected() {
+  public iceReconnected() {
     if (this.iceState.disconnected) {
       LoggerProxy.logger.log('ReconnectionManager:index#iceReconnected --> ice has reconnected');
 
@@ -153,13 +176,13 @@ export default class ReconnectionManager {
    * @public
    * @memberof ReconnectionManager
    */
-  waitForIceReconnect() {
+  public waitForIceReconnect() {
     if (!this.iceState.disconnected) {
       LoggerProxy.logger.log('ReconnectionManager:index#waitForIceReconnect --> waiting for ice reconnect');
 
       this.iceState.disconnected = true;
 
-      return new Promise((resolve, reject) => {
+      return new Promise<void>((resolve, reject) => {
         this.iceState.timer = setTimeout(() => {
           if (this.iceState.disconnected === false) {
             resolve();
@@ -183,7 +206,7 @@ export default class ReconnectionManager {
    * @public
    * @memberof ReconnectionManager
    */
-  reset() {
+  public reset() {
     this.status = RECONNECTION.STATE.DEFAULT_STATUS;
     this.tryCount = RECONNECTION.STATE.DEFAULT_TRY_COUNT;
     this.rejoinAttempts = RECONNECTION.STATE.DEFAULT_TRY_COUNT;
@@ -194,7 +217,7 @@ export default class ReconnectionManager {
    * @public
    * @memberof ReconnectionManager
    */
-  cleanUp() {
+  public cleanUp() {
     this.reset();
     this.meeting = null;
   }
@@ -205,7 +228,7 @@ export default class ReconnectionManager {
    * @private
    * @memberof ReconnectionManager
    */
-  validate() {
+  private validate() {
     if (this.meeting.config.reconnection.enabled) {
       if (
         this.status === RECONNECTION.STATE.DEFAULT_STATUS ||
@@ -233,7 +256,13 @@ export default class ReconnectionManager {
    * @public
    * @memberof ReconnectionManager
    */
-  async reconnect({networkDisconnect = false, networkRetry = false} = {}) {
+  public async reconnect({
+    networkDisconnect = false,
+    networkRetry = false,
+  }: {
+    networkDisconnect?: boolean;
+    networkRetry?: boolean;
+  } = {}) {
     LoggerProxy.logger.info(`ReconnectionManager:index#reconnect --> Reconnection start for meeting ${this.meeting.id}.`);
     // First, validate that we can reconnect, if not, it will throw an error
     try {
@@ -315,7 +344,7 @@ export default class ReconnectionManager {
    * @private
    * @memberof ReconnectionManager
    */
-  async executeReconnection({networkDisconnect = false}) {
+  private async executeReconnection({ networkDisconnect = false }: { networkDisconnect?: boolean }) {
     this.status = RECONNECTION.STATE.IN_PROGRESS;
 
     LoggerProxy.logger.info('ReconnectionManager:index#executeReconnection --> Attempting to reconnect to meeting.');
@@ -385,7 +414,7 @@ export default class ReconnectionManager {
    * @param {boolean} wasSharing
    * @returns {Promise}
    */
-  async rejoinMeeting(wasSharing = false) {
+  async rejoinMeeting(wasSharing: boolean = false) {
     try {
       LoggerProxy.logger.info('ReconnectionManager:index#rejoinMeeting --> attemping meeting rejoin');
       const previousCorrelationId = this.meeting.correlationId;
@@ -481,7 +510,7 @@ export default class ReconnectionManager {
    * @private
    * @memberof ReconnectionManager
    */
-  async reconnectMercuryWebSocket() {
+  private async reconnectMercuryWebSocket() {
     LoggerProxy.logger.info('ReconnectionManager:index#reconnectMercuryWebSocket --> Reconnecting websocket.');
     // First, attempt to disconnect if we think we are already connected.
     if (this.webex.internal.mercury.connected) {
@@ -515,7 +544,7 @@ export default class ReconnectionManager {
    * @private
    * @memberof ReconnectionManager
    */
-  static async setupPeerConnection(meeting) {
+  private static async setupPeerConnection(meeting: Meeting) {
     LoggerProxy.logger.log('ReconnectionManager:index#setupPeerConnection --> Begin resetting peer connection');
     // close pcs, unset to null and create a new one with out closing any streams
     PeerConnectionManager.close(meeting.mediaProperties.peerConnection);

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

@@ -36,6 +36,7 @@ const RoapCollection = {
     const seq = this.getSessionSequence(id, seqId);
     if (seq) {
       if (!seq.finished) {
+        // @ts-ignore
         session.activeSequences -= 1;
       }
       delete this.sessions[id][seqId];

package/src/roap/{handler.js → handler.ts}

@@ -1,4 +1,5 @@
 /* no-param-reassign */
+// @ts-ignore
 import {StatelessWebexPlugin} from '@webex/webex-core';
 
 import LoggerProxy from '../common/logs/logger-proxy';
@@ -8,6 +9,7 @@ import BEHAVIORAL_METRICS from '../metrics/constants';
 
 import RoapUtil from './util';
 import RoapCollection from './collection';
+import Meeting from '../meeting';
 
 
 const checkForAndHandleErrors = (action, meeting, correlationId) => {
@@ -67,6 +69,13 @@ const handleSessionStep = ({
  * @class RoapHandler
  */
 export default class RoapHandler extends StatelessWebexPlugin {
+  attrs: any;
+  lastRoapMessage: any;
+  options: any;
+  roapAnswer: any;
+  roapFinished: any;
+  roapOk: any;
+  
   constructor(attrs, options, roapOk, roapAnswer, roapFinished) {
     super({}, options);
     this.attrs = attrs;
@@ -84,7 +93,7 @@ export default class RoapHandler extends StatelessWebexPlugin {
    * @param {Object} action
    * @returns {null}
    */
-  perform(session, meeting, action) {
+  perform(session: any, meeting: any, action: any) {
     switch (session.state.state) {
       case ROAP.ROAP_STATE.INIT:
         this.roapFinished(meeting.correlationId, action.msg.seq);
@@ -150,6 +159,7 @@ export default class RoapHandler extends StatelessWebexPlugin {
           LoggerProxy.logger.log('Roap:handler#perform --> Roap State remote offer won after GLARE.');
         }
         session.state.step(ROAP.ROAP_SIGNAL.GLARE_RESOLVED, meeting, action);
+        // @ts-ignore
         this.perform(session, meeting);
         break;
       default:
@@ -166,7 +176,7 @@ export default class RoapHandler extends StatelessWebexPlugin {
    * @param {String} prefix
    * @returns {null}
    */
-  execute(signal, session, action, meeting, prefix) {
+  execute(signal: string, session: any, action: any, meeting: Meeting, prefix: string) {
     if (session && session.state) {
       handleSessionStep({
         roap: action,
@@ -188,7 +198,7 @@ export default class RoapHandler extends StatelessWebexPlugin {
    * @param {String} correlationId
    * @returns {Boolean}
    */
-  handleAction(session, action, meeting, correlationId) {
+  handleAction(session: object, action: any, meeting: Meeting, correlationId: string) {
     let signal;
 
 
@@ -233,7 +243,7 @@ export default class RoapHandler extends StatelessWebexPlugin {
    * @param {Object} action
    * @returns {Boolean}
    */
-  submit(action) {
+  submit(action: any) {
     const {correlationId} = action;
     let {seq} = action;
 
@@ -241,6 +251,7 @@ export default class RoapHandler extends StatelessWebexPlugin {
       seq = action.msg.seq;
     }
     const session = RoapCollection.getSessionSequence(correlationId, seq);
+    // @ts-ignore
     const meeting = this.webex.meetings.meetingCollection.getByKey('correlationId', correlationId);
 
     if (checkForAndHandleErrors(action, meeting, correlationId)) {

package/src/roap/{index.js → index.ts}

@@ -1,3 +1,4 @@
+// @ts-ignore
 import {StatelessWebexPlugin} from '@webex/webex-core';
 
 import {ROAP} from '../constants';
@@ -8,6 +9,7 @@ import RoapHandler from './handler';
 import RoapRequest from './request';
 import RoapCollection from './collection';
 import TurnDiscovery from './turnDiscovery';
+import Meeting from '../meeting';
 
 /**
  * Roap options
@@ -31,12 +33,19 @@ import TurnDiscovery from './turnDiscovery';
  * @private
  */
 export default class Roap extends StatelessWebexPlugin {
+  attrs: any;
+  lastRoapOffer: any;
+  options: any;
+  roapHandler: any;
+  roapRequest: any;
+  turnDiscovery: any;
+
   /**
    *
    * @param {Object} attrs
    * @param {Object} options
    */
-  constructor(attrs, options) {
+  constructor(attrs: any, options: any) {
     super({}, options);
     /**
      * @instance
@@ -67,6 +76,7 @@ export default class Roap extends StatelessWebexPlugin {
      * @private
      * @memberof Roap
      */
+    // @ts-ignore
     this.roapRequest = new RoapRequest({}, options);
     /**
      * The last roap offer sent to server and acked
@@ -87,7 +97,7 @@ export default class Roap extends StatelessWebexPlugin {
    * @private
    * @memberof Roap
    */
-  roapEvent(data) {
+  private roapEvent(data: any) {
     const msg = data.message;
     const {correlationId} = data;
 
@@ -115,7 +125,7 @@ export default class Roap extends StatelessWebexPlugin {
    * @private
    * @memberof Roap
    */
-  stop(correlationId, seq) {
+  private stop(correlationId: string, seq: number) {
     this.roapHandler.submit({
       type: ROAP.RECEIVE_CALL_LEAVE,
       seq,
@@ -132,8 +142,9 @@ export default class Roap extends StatelessWebexPlugin {
    * @private
    * @memberof Roap
    */
-  sendRoapOK(options) {
+  private sendRoapOK(options: any) {
     return Promise.resolve().then(() => {
+      // @ts-ignore
       const meeting = this.webex.meetings.meetingCollection.getByKey('correlationId', options.correlationId);
       const roapMessage = {
         messageType: ROAP.ROAP_TYPES.OK,
@@ -176,7 +187,8 @@ export default class Roap extends StatelessWebexPlugin {
    * @private
    * @memberof Roap
    */
-  sendRoapAnswer(options) {
+  private sendRoapAnswer(options: any) {
+    // @ts-ignore
     const meeting = this.webex.meetings.meetingCollection.getByKey('correlationId', options.correlationId);
     const roapMessage = {
       messageType: ROAP.ROAP_TYPES.ANSWER,
@@ -221,7 +233,7 @@ export default class Roap extends StatelessWebexPlugin {
    * @private
    * @memberof Roap
    */
-  sendRoapError(session, locus, errorType) {
+  private sendRoapError(session: any, locus: object, errorType: string) {
     const msg = {
       messageType: ROAP.ROAP_TYPES.ERROR,
       version: ROAP.ROAP_VERSION,
@@ -239,7 +251,7 @@ export default class Roap extends StatelessWebexPlugin {
    * @private
    * @memberof Roap
    */
-  sendRoapMediaRequest(options) {
+  sendRoapMediaRequest(options: any) {
     const {meeting, reconnect} = options;
     const roapMessage = {
       messageType: ROAP.ROAP_TYPES.OFFER,
@@ -298,7 +310,7 @@ export default class Roap extends StatelessWebexPlugin {
    * @private
    * @memberof Roap
    */
-  sendRoapCallRequest = (options) => {
+  sendRoapCallRequest = (options: any) => {
     const {meeting} = options;
     const roapMessage = {
       messageType: ROAP.ROAP_TYPES.OFFER,
@@ -354,8 +366,9 @@ export default class Roap extends StatelessWebexPlugin {
  * @private
  * @memberof Roap
  */
-  roapFinished(correlationId, sequenceId) {
+  private roapFinished(correlationId: string, sequenceId: string) {
     RoapCollection.onSessionSequenceFinish(correlationId, sequenceId);
+    // @ts-ignore
     const meeting = this.webex.meetings.meetingCollection.getByKey('correlationId', correlationId);
 
     meeting.mediaNegotiatedEvent();
@@ -374,7 +387,7 @@ export default class Roap extends StatelessWebexPlugin {
    *                                 media connection just after a reconnection
    * @returns {Promise}
    */
-  doTurnDiscovery(meeting, isReconnecting) {
+  doTurnDiscovery(meeting: Meeting, isReconnecting: boolean) {
     return this.turnDiscovery.doTurnDiscovery(meeting, isReconnecting);
   }
 }

package/src/roap/{request.js → request.ts}

@@ -1,5 +1,5 @@
-
 /* global window */
+// @ts-ignore
 import {StatelessWebexPlugin} from '@webex/webex-core';
 
 import LoggerProxy from '../common/logs/logger-proxy';
@@ -50,10 +50,11 @@ export default class RoapRequest extends StatelessWebexPlugin {
     LoggerProxy.logger.info(`Roap:request#joinMeetingWithRoap --> Local SDP: ${options.roapMessage}`);
 
     return Promise.resolve().then(async () => {
+      // @ts-ignore
       const deviceUrl = this.webex.internal.device.url;
       let url = '';
 
-      const body = {
+      const body: any = {
         deviceUrl,
         usingResource: options.resourceId || null,
         correlationId: options.correlationId,
@@ -76,7 +77,9 @@ export default class RoapRequest extends StatelessWebexPlugin {
       }
       else if (options.sipUrl) {
         try {
+          // @ts-ignore
           await this.webex.internal.services.waitForCatalog('postauth');
+          // @ts-ignore
           url = `${this.webex.internal.services.get('locus')}/${LOCI}/${CALL}`;
           body.invitee = {
             address: options.sipTarget
@@ -91,6 +94,7 @@ export default class RoapRequest extends StatelessWebexPlugin {
         throw new ParameterError('Must provide a locusUrl or sipTarget');
       }
 
+      // @ts-ignore
       return this.webex
         .request({
           method: HTTP_VERBS.POST,
@@ -125,7 +129,16 @@ export default class RoapRequest extends StatelessWebexPlugin {
    * @param {String} options.meetingId
    * @returns {Promise} returns the response/failure of the request
    */
-  sendRoap(options) {
+  sendRoap(options: {
+    roapMessage: any;
+    locusSelfUrl: string;
+    mediaId: string;
+    correlationId: string;
+    audioMuted: boolean;
+    videoMuted: boolean;
+    meetingId: string;
+    preferTranscoding?: boolean;
+  }) {
     const {
       roapMessage, locusSelfUrl, mediaId, correlationId, meetingId
     } = options;
@@ -135,12 +148,14 @@ export default class RoapRequest extends StatelessWebexPlugin {
     }
 
     const mediaUrl = `${locusSelfUrl}/${MEDIA}`;
+    // @ts-ignore
     const deviceUrl = this.webex.internal.device.url;
 
     LoggerProxy.logger.info(`Roap:request#sendRoap --> ${mediaUrl} \n ${roapMessage.messageType} \n seq:${roapMessage.seq}`);
 
     Metrics.postEvent({event: eventType.MEDIA_REQUEST, meetingId});
 
+    // @ts-ignore
     return this.webex
       .request({
         uri: mediaUrl,
@@ -148,6 +163,7 @@ export default class RoapRequest extends StatelessWebexPlugin {
         body: {
           device: {
             url: deviceUrl,
+            // @ts-ignore
             deviceType: this.config.meetings.deviceType
           },
           correlationId,

package/src/roap/{state.js → state.ts}

@@ -2,6 +2,7 @@ import StateMachine from 'javascript-state-machine';
 
 import LoggerProxy from '../common/logs/logger-proxy';
 import {ROAP, _OFFER_, _ANSWER_, _REQUESTED_} from '../constants';
+import Meeting from '../meeting';
 
 const shouldStep = (roap, meeting) => {
   const {messageType} = roap.msg;
@@ -115,7 +116,7 @@ const RoapStateMachine = {
            * @param {Object} roap
            * @returns {String} new state value
            */
-          to(signal, meeting, roap) {
+          to(signal: string, meeting: Meeting, roap: object) {
             const value = this.state;
 
             if (!shouldStep(roap, meeting)) {
@@ -132,7 +133,7 @@ const RoapStateMachine = {
          * @param {Object} transition
          * @returns {null}
          */
-        onAfterStep(transition) {
+        onAfterStep(transition: any) {
           LoggerProxy.logger.log(
             `Roap:state#onAfterStep --> RoapStateMachine->onAfterStep#fired! State changed from '${transition.from}' to '${
               transition.to

package/src/roap/turnDiscovery.ts

@@ -1,3 +1,4 @@
+// @ts-ignore - Types not available for @webex/common
 import {Defer} from '@webex/common';
 
 import Metrics from '../metrics';
@@ -6,6 +7,7 @@ import LoggerProxy from '../common/logs/logger-proxy';
 import {ROAP} from '../constants';
 
 import RoapRequest from './request';
+import Meeting from '../meeting';
 
 const TURN_DISCOVERY_TIMEOUT = 10; // in seconds
 
@@ -48,7 +50,7 @@ export default class TurnDiscovery {
    * @private
    * @memberof Roap
    */
-  waitForTurnDiscoveryResponse() {
+  private waitForTurnDiscoveryResponse() {
     if (!this.defer) {
       LoggerProxy.logger.warn('Roap:turnDiscovery#waitForTurnDiscoveryResponse --> TURN discovery is not in progress');
 
@@ -76,7 +78,8 @@ export default class TurnDiscovery {
    * @public
    * @memberof Roap
    */
-  handleTurnDiscoveryResponse(roapMessage) {
+  public handleTurnDiscoveryResponse(roapMessage: object) {
+    // @ts-ignore - Fix missing type
     const {headers} = roapMessage;
 
     if (!this.defer) {
@@ -125,7 +128,7 @@ export default class TurnDiscovery {
    * @private
    * @memberof Roap
    */
-  sendRoapTurnDiscoveryRequest(meeting, isReconnecting) {
+  private sendRoapTurnDiscoveryRequest(meeting: Meeting, isReconnecting: boolean) {
     const seq = meeting.roapSeq + 1;
 
     if (this.defer) {
@@ -148,7 +151,9 @@ export default class TurnDiscovery {
       .sendRoap({
         roapMessage,
         correlationId: meeting.correlationId,
+       // @ts-ignore - Fix missing type
         locusSelfUrl: meeting.selfUrl,
+        // @ts-ignore - Fix missing type
         mediaId: isReconnecting ? '' : meeting.mediaId,
         audioMuted: meeting.isAudioMuted(),
         videoMuted: meeting.isVideoMuted(),
@@ -170,7 +175,7 @@ export default class TurnDiscovery {
    * @param {Meeting} meeting
    * @returns {Promise}
    */
-  sendRoapOK(meeting) {
+  sendRoapOK(meeting: Meeting) {
     LoggerProxy.logger.info('Roap:turnDiscovery#sendRoapOK --> sending OK');
 
     return this.roapRequest.sendRoap({
@@ -179,7 +184,9 @@ export default class TurnDiscovery {
         version: ROAP.ROAP_VERSION,
         seq: meeting.roapSeq
       },
+      // @ts-ignore - fix type
       locusSelfUrl: meeting.selfUrl,
+      // @ts-ignore - fix type
       mediaId: meeting.mediaId,
       correlationId: meeting.correlationId,
       audioMuted: meeting.isAudioMuted(),
@@ -201,7 +208,8 @@ export default class TurnDiscovery {
    *                                 media connection just after a reconnection
    * @returns {Promise}
    */
-  doTurnDiscovery(meeting, isReconnecting) {
+  doTurnDiscovery(meeting: Meeting, isReconnecting: boolean) {
+    // @ts-ignore - fix type
     const isAnyClusterReachable = meeting.webex.meetings.reachability.isAnyClusterReachable();
 
     if (isAnyClusterReachable) {
@@ -209,6 +217,7 @@ export default class TurnDiscovery {
       return Promise.resolve({turnServerInfo: undefined, turnDiscoverySkippedReason: 'reachability'});
     }
 
+    // @ts-ignore - fix type
     if (!meeting.config.experimental.enableTurnDiscovery) {
       LoggerProxy.logger.info('Roap:turnDiscovery#doTurnDiscovery --> TURN discovery disabled in config, skipping it');
 

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

@@ -1,4 +1,3 @@
-
 import PeerConnectionManager from '../peer-connection-manager';
 import {
   _ANSWER_,
@@ -10,7 +9,7 @@ import {
 import LoggerProxy from '../common/logs/logger-proxy';
 import ParameterError from '../common/errors/parameter';
 
-const RoapUtil = {};
+const RoapUtil: any = {};
 const ROAP_ANSWER = _ANSWER_.toLowerCase();
 
 RoapUtil.shouldHandleMedia = (meeting) => {