@wazo/sdk 0.37.31 → 0.37.35

package/lib/simple/room/Room.js

@@ -2228,6 +2228,7 @@ var authMethods = (client              , baseUrl        ) => ({
                     
                        
                      
+                      
    )                    {
     const body         = {
       backend: params.backend || DEFAULT_BACKEND_USER,
@@ -2247,6 +2248,10 @@ var authMethods = (client              , baseUrl        ) => ({
       headers['Wazo-Session-Type'] = 'mobile';
     }
 
+    if (params.tenantId) {
+      body.tenant_id = params.tenantId;
+    }
+
     return client.post(`${baseUrl}/token`, body, headers).then(response => Session.parse(response));
   },
 
@@ -3603,6 +3608,14 @@ class CallSession {
     return !!this.answerTime;
   }
 
+  toJSON() {
+    const jsonObj = { ...this };
+    // $FlowFixMe
+    jsonObj.answered = this.answered;
+
+    return jsonObj;
+  }
+
   static parseCall(call      )              {
     return new CallSession({
       callId: call.id,
@@ -3713,11 +3726,13 @@ class Recording {
                          
                                 
                             
+                                 
                    
                
              
                            
                       
+                           
                                   
                               
                          
@@ -3738,10 +3753,12 @@ class Recording {
                 
                       
                  
+                  
     
            
                       
                  
+                  
     
              
                    
@@ -3803,10 +3820,12 @@ class CallLog {
           || plain.destination_extension
           || `meeting-${plain.requested_name || plain.destination_name || ''}`,
         name: plain.requested_name || plain.destination_name || '',
+        uuid: plain.destination_user_uuid,
       },
       source: {
         extension: plain.source_extension,
         name: plain.source_name,
+        uuid: plain.source_user_uuid,
       },
       id: plain.id,
       duration: (plain.duration || 0) * 1000, // duration is in seconds
@@ -4854,6 +4873,34 @@ var chatdMethods = (client              , baseUrl        ) => ({
     client.get(`${baseUrl}/users/me/rooms/messages`, options),
 });
 
+//      
+
+                                     
+               
+  
+
+class MeetingStatus {
+               
+
+                
+
+  constructor({
+    full,
+  }         = {}) {
+    this.full = full;
+
+    // Useful to compare instead of instanceof with minified code
+    this.type = 'MeetingStatus';
+  }
+
+  static parse(plain                       )                {
+    return new MeetingStatus({
+      full: plain.full,
+    });
+  }
+
+}
+
 /*       */
 
                   
@@ -5048,6 +5095,8 @@ var calldMethods = (client              , baseUrl        ) => ({
     client.put(`${baseUrl}/users/me/calls/${callId}/record/resume`, null, null,
       ApiRequester.successResponseParser),
 
+  guestGetMeetingStatus: (meetingUuid        )                         =>
+    client.get(`${baseUrl}/guests/me/meetings/${meetingUuid}/status`).then(MeetingStatus.parse),
 });
 
 //      
@@ -6637,7 +6686,7 @@ const events$1 = [REGISTERED, UNREGISTERED, REGISTRATION_FAILED, INVITE];
 const transportEvents = [CONNECTED, DISCONNECTED, TRANSPORT_ERROR, MESSAGE];
 class CanceledCallError extends Error {}
 
-const MAX_REGISTER_TRIES = 10;
+const MAX_REGISTER_TRIES = 5;
 
                     
                           
@@ -6691,6 +6740,7 @@ class WebRTCClient extends Emitter {
                         
                                                       
                                             
+                       
 
   // sugar
                         
@@ -6753,6 +6803,7 @@ class WebRTCClient extends Emitter {
     this.conferences = {};
     this.networkMonitoringInterval = {};
     this.sessionNetworkStats = {};
+    this.forceClosed = false;
 
     this._boundOnHeartbeat = this._onHeartbeat.bind(this);
     this.heartbeat = new Heartbeat(config.heartbeatDelay, config.heartbeatTimeout, config.maxHeartbeats);
@@ -6874,6 +6925,8 @@ class WebRTCClient extends Emitter {
       skipRegister: this.skipRegister,
     };
 
+    this.forceClosed = false;
+
     if (this.skipRegister) {
       logger$8.info('sdk webrtc skip register...', logInfo);
       return Promise.resolve();
@@ -6898,7 +6951,15 @@ class WebRTCClient extends Emitter {
     const registerOptions = this._isWeb() ? {} : { extraContactHeaderParams: ['mobility=mobile'] };
 
     const onRegisterFailed = () => {
-      logger$8.info('sdk webrtc registering failed', { tries, registerer: !!this.registerer });
+      logger$8.info('sdk webrtc registering failed', {
+        tries,
+        registerer: !!this.registerer,
+        forceClosed: this.forceClosed,
+      });
+      if (this.forceClosed) {
+        return;
+      }
+
       this.connectionPromise = null;
       if (this.registerer && this.registerer.waiting) {
         this.registerer.waitingToggle(false);
@@ -7176,8 +7237,9 @@ class WebRTCClient extends Emitter {
     }
   }
 
-  async close() {
-    logger$8.info('sdk webrtc closing client', { userAgent: !!this.userAgent });
+  async close(force          = false) {
+    logger$8.info('sdk webrtc closing client', { userAgent: !!this.userAgent, force });
+    this.forceClosed = force;
     this._cleanupMedia();
     this.connectionPromise = null;
 
@@ -7196,7 +7258,7 @@ class WebRTCClient extends Emitter {
     this.userAgent.delegate = null;
     this.userAgent.stateChange.removeAllListeners();
 
-    await this._disconnectTransport();
+    await this._disconnectTransport(force);
 
     this._cleanupRegister();
 
@@ -8632,7 +8694,15 @@ class WebRTCClient extends Emitter {
     return userAgent.UserAgent.makeURI(`sip:${target}@${this.config.host}`);
   }
 
-  async _disconnectTransport() {
+  async _disconnectTransport(force          = false) {
+    if (force) {
+      // Bypass sip.js state machine that prevent to close WS with the state `Connecting`
+      this.userAgent.transport.disconnectResolve = () => {};
+      // eslint-disable-next-line
+      this.userAgent.transport._ws.close(1000);
+      return;
+    }
+
     // Check if `disconnectPromise` is not present to avoid `Disconnect promise must not be defined` errors.
     if (this.userAgent && this.userAgent.transport && !this.userAgent.transport.disconnectPromise) {
       try {
@@ -9579,6 +9649,12 @@ class WebRTCPhone extends Emitter                  {
       return Promise.resolve(null);
     }
 
+    const sipSessionId = this.getSipSessionIdFromCallSession(callSession);
+    if (sipSessionId && !(sipSessionId in this.callSessions)) {
+      logger$7.warn('Call session already ended or not found, can\'t accept it.', { sipSessionId });
+      return Promise.resolve(null);
+    }
+
     if (callSession.getId() in this.acceptedSessions) {
       logger$7.warn('CallSession already accepted.', { id: callSession ? callSession.getId() : 'n/a' });
       return Promise.resolve(callSession.sipCallId);
@@ -10039,7 +10115,7 @@ class WebRTCPhone extends Emitter                  {
     return this.client && this.client.isConference(callSession.sipCallId);
   }
 
-  async close()                {
+  async close(force          = false)                {
     logger$7.info('WebRTC close');
 
     try {
@@ -10051,7 +10127,7 @@ class WebRTCPhone extends Emitter                  {
       logger$7.error('WebRTC close, unregister error', e);
     }
 
-    this.client.close();
+    this.client.close(force);
     this.unbind();
 
     this.incomingSessions = [];
@@ -10203,9 +10279,17 @@ class WebRTCPhone extends Emitter                  {
     });
 
     this.client.on(this.client.ACCEPTED, (sipSession         ) => {
-      logger$7.info('WebRTC call accepted', { sipId: sipSession.id });
+      const sessionId = this.getSipSessionId(sipSession);
+      const hasSession = sessionId in this.callSessions;
+
+      logger$7.info('WebRTC call accepted', { sipId: sessionId, hasSession });
+
+      if (!hasSession) {
+        logger$7.warn('Call accepted ignored, session is no longer present in the WebRtcPhone', { sessionId });
+        return;
+      }
 
-      this._onCallAccepted(sipSession, this.client.hasVideo(this.getSipSessionId(sipSession)));
+      this._onCallAccepted(sipSession, this.client.hasVideo(sessionId));
 
       if (this.audioOutputDeviceId) {
         this.client.changeAudioOutputDevice(this.audioOutputDeviceId);
@@ -10341,9 +10425,14 @@ class WebRTCPhone extends Emitter                  {
     return this.client.getSipSessionId(sipSession);
   }
 
-  _updateCallSession(callSession             ) {
+  getSipSessionIdFromCallSession(callSession             ) {
     const sipSession = this.findSipSession(callSession);
-    const sipSessionId = sipSession ? this.getSipSessionId(sipSession) : null;
+
+    return sipSession ? this.getSipSessionId(sipSession) : null;
+  }
+
+  _updateCallSession(callSession             ) {
+    const sipSessionId = this.getSipSessionIdFromCallSession(callSession);
 
     if (sipSessionId) {
       this.callSessions[sipSessionId] = callSession;

package/lib/simple/room/SipRoom.js

@@ -2226,6 +2226,7 @@ var authMethods = (client              , baseUrl        ) => ({
                     
                        
                      
+                      
    )                    {
     const body         = {
       backend: params.backend || DEFAULT_BACKEND_USER,
@@ -2245,6 +2246,10 @@ var authMethods = (client              , baseUrl        ) => ({
       headers['Wazo-Session-Type'] = 'mobile';
     }
 
+    if (params.tenantId) {
+      body.tenant_id = params.tenantId;
+    }
+
     return client.post(`${baseUrl}/token`, body, headers).then(response => Session.parse(response));
   },
 
@@ -3601,6 +3606,14 @@ class CallSession {
     return !!this.answerTime;
   }
 
+  toJSON() {
+    const jsonObj = { ...this };
+    // $FlowFixMe
+    jsonObj.answered = this.answered;
+
+    return jsonObj;
+  }
+
   static parseCall(call      )              {
     return new CallSession({
       callId: call.id,
@@ -3711,11 +3724,13 @@ class Recording {
                          
                                 
                             
+                                 
                    
                
              
                            
                       
+                           
                                   
                               
                          
@@ -3736,10 +3751,12 @@ class Recording {
                 
                       
                  
+                  
     
            
                       
                  
+                  
     
              
                    
@@ -3801,10 +3818,12 @@ class CallLog {
           || plain.destination_extension
           || `meeting-${plain.requested_name || plain.destination_name || ''}`,
         name: plain.requested_name || plain.destination_name || '',
+        uuid: plain.destination_user_uuid,
       },
       source: {
         extension: plain.source_extension,
         name: plain.source_name,
+        uuid: plain.source_user_uuid,
       },
       id: plain.id,
       duration: (plain.duration || 0) * 1000, // duration is in seconds
@@ -4852,6 +4871,34 @@ var chatdMethods = (client              , baseUrl        ) => ({
     client.get(`${baseUrl}/users/me/rooms/messages`, options),
 });
 
+//      
+
+                                     
+               
+  
+
+class MeetingStatus {
+               
+
+                
+
+  constructor({
+    full,
+  }         = {}) {
+    this.full = full;
+
+    // Useful to compare instead of instanceof with minified code
+    this.type = 'MeetingStatus';
+  }
+
+  static parse(plain                       )                {
+    return new MeetingStatus({
+      full: plain.full,
+    });
+  }
+
+}
+
 /*       */
 
                   
@@ -5046,6 +5093,8 @@ var calldMethods = (client              , baseUrl        ) => ({
     client.put(`${baseUrl}/users/me/calls/${callId}/record/resume`, null, null,
       ApiRequester.successResponseParser),
 
+  guestGetMeetingStatus: (meetingUuid        )                         =>
+    client.get(`${baseUrl}/guests/me/meetings/${meetingUuid}/status`).then(MeetingStatus.parse),
 });
 
 //      
@@ -6635,7 +6684,7 @@ const events$1 = [REGISTERED, UNREGISTERED, REGISTRATION_FAILED, INVITE];
 const transportEvents = [CONNECTED, DISCONNECTED, TRANSPORT_ERROR, MESSAGE];
 class CanceledCallError extends Error {}
 
-const MAX_REGISTER_TRIES = 10;
+const MAX_REGISTER_TRIES = 5;
 
                     
                           
@@ -6689,6 +6738,7 @@ class WebRTCClient extends Emitter {
                         
                                                       
                                             
+                       
 
   // sugar
                         
@@ -6751,6 +6801,7 @@ class WebRTCClient extends Emitter {
     this.conferences = {};
     this.networkMonitoringInterval = {};
     this.sessionNetworkStats = {};
+    this.forceClosed = false;
 
     this._boundOnHeartbeat = this._onHeartbeat.bind(this);
     this.heartbeat = new Heartbeat(config.heartbeatDelay, config.heartbeatTimeout, config.maxHeartbeats);
@@ -6872,6 +6923,8 @@ class WebRTCClient extends Emitter {
       skipRegister: this.skipRegister,
     };
 
+    this.forceClosed = false;
+
     if (this.skipRegister) {
       logger$8.info('sdk webrtc skip register...', logInfo);
       return Promise.resolve();
@@ -6896,7 +6949,15 @@ class WebRTCClient extends Emitter {
     const registerOptions = this._isWeb() ? {} : { extraContactHeaderParams: ['mobility=mobile'] };
 
     const onRegisterFailed = () => {
-      logger$8.info('sdk webrtc registering failed', { tries, registerer: !!this.registerer });
+      logger$8.info('sdk webrtc registering failed', {
+        tries,
+        registerer: !!this.registerer,
+        forceClosed: this.forceClosed,
+      });
+      if (this.forceClosed) {
+        return;
+      }
+
       this.connectionPromise = null;
       if (this.registerer && this.registerer.waiting) {
         this.registerer.waitingToggle(false);
@@ -7174,8 +7235,9 @@ class WebRTCClient extends Emitter {
     }
   }
 
-  async close() {
-    logger$8.info('sdk webrtc closing client', { userAgent: !!this.userAgent });
+  async close(force          = false) {
+    logger$8.info('sdk webrtc closing client', { userAgent: !!this.userAgent, force });
+    this.forceClosed = force;
     this._cleanupMedia();
     this.connectionPromise = null;
 
@@ -7194,7 +7256,7 @@ class WebRTCClient extends Emitter {
     this.userAgent.delegate = null;
     this.userAgent.stateChange.removeAllListeners();
 
-    await this._disconnectTransport();
+    await this._disconnectTransport(force);
 
     this._cleanupRegister();
 
@@ -8630,7 +8692,15 @@ class WebRTCClient extends Emitter {
     return userAgent.UserAgent.makeURI(`sip:${target}@${this.config.host}`);
   }
 
-  async _disconnectTransport() {
+  async _disconnectTransport(force          = false) {
+    if (force) {
+      // Bypass sip.js state machine that prevent to close WS with the state `Connecting`
+      this.userAgent.transport.disconnectResolve = () => {};
+      // eslint-disable-next-line
+      this.userAgent.transport._ws.close(1000);
+      return;
+    }
+
     // Check if `disconnectPromise` is not present to avoid `Disconnect promise must not be defined` errors.
     if (this.userAgent && this.userAgent.transport && !this.userAgent.transport.disconnectPromise) {
       try {
@@ -9577,6 +9647,12 @@ class WebRTCPhone extends Emitter                  {
       return Promise.resolve(null);
     }
 
+    const sipSessionId = this.getSipSessionIdFromCallSession(callSession);
+    if (sipSessionId && !(sipSessionId in this.callSessions)) {
+      logger$7.warn('Call session already ended or not found, can\'t accept it.', { sipSessionId });
+      return Promise.resolve(null);
+    }
+
     if (callSession.getId() in this.acceptedSessions) {
       logger$7.warn('CallSession already accepted.', { id: callSession ? callSession.getId() : 'n/a' });
       return Promise.resolve(callSession.sipCallId);
@@ -10037,7 +10113,7 @@ class WebRTCPhone extends Emitter                  {
     return this.client && this.client.isConference(callSession.sipCallId);
   }
 
-  async close()                {
+  async close(force          = false)                {
     logger$7.info('WebRTC close');
 
     try {
@@ -10049,7 +10125,7 @@ class WebRTCPhone extends Emitter                  {
       logger$7.error('WebRTC close, unregister error', e);
     }
 
-    this.client.close();
+    this.client.close(force);
     this.unbind();
 
     this.incomingSessions = [];
@@ -10201,9 +10277,17 @@ class WebRTCPhone extends Emitter                  {
     });
 
     this.client.on(this.client.ACCEPTED, (sipSession         ) => {
-      logger$7.info('WebRTC call accepted', { sipId: sipSession.id });
+      const sessionId = this.getSipSessionId(sipSession);
+      const hasSession = sessionId in this.callSessions;
+
+      logger$7.info('WebRTC call accepted', { sipId: sessionId, hasSession });
+
+      if (!hasSession) {
+        logger$7.warn('Call accepted ignored, session is no longer present in the WebRtcPhone', { sessionId });
+        return;
+      }
 
-      this._onCallAccepted(sipSession, this.client.hasVideo(this.getSipSessionId(sipSession)));
+      this._onCallAccepted(sipSession, this.client.hasVideo(sessionId));
 
       if (this.audioOutputDeviceId) {
         this.client.changeAudioOutputDevice(this.audioOutputDeviceId);
@@ -10339,9 +10423,14 @@ class WebRTCPhone extends Emitter                  {
     return this.client.getSipSessionId(sipSession);
   }
 
-  _updateCallSession(callSession             ) {
+  getSipSessionIdFromCallSession(callSession             ) {
     const sipSession = this.findSipSession(callSession);
-    const sipSessionId = sipSession ? this.getSipSessionId(sipSession) : null;
+
+    return sipSession ? this.getSipSessionId(sipSession) : null;
+  }
+
+  _updateCallSession(callSession             ) {
+    const sipSessionId = this.getSipSessionIdFromCallSession(callSession);
 
     if (sipSessionId) {
       this.callSessions[sipSessionId] = callSession;