@wazo/sdk 0.37.30 → 0.37.34

package/lib/simple/Phone.js

@@ -594,13 +594,21 @@ class CallSession {
 
   // Retro-compatibility: `answered` was a boolean before. We can reproduce the behaviour with a getter/setter
   set answered(value         ) {
-    this.answerTime = value ? new Date() : null;
+    this.answerTime = value ? this.answerTime || new Date() : null;
   }
 
   get answered()          {
     return !!this.answerTime;
   }
 
+  toJSON() {
+    const jsonObj = { ...this };
+    // $FlowFixMe
+    jsonObj.answered = this.answered;
+
+    return jsonObj;
+  }
+
   static parseCall(call      )              {
     return new CallSession({
       callId: call.id,
@@ -4852,6 +4860,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 +5082,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),
 });
 
 //      
@@ -6371,7 +6409,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;
 
                     
                           
@@ -6425,6 +6463,7 @@ class WebRTCClient extends Emitter {
                         
                                                       
                                             
+                       
 
   // sugar
                         
@@ -6487,6 +6526,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);
@@ -6608,6 +6648,8 @@ class WebRTCClient extends Emitter {
       skipRegister: this.skipRegister,
     };
 
+    this.forceClosed = false;
+
     if (this.skipRegister) {
       logger$9.info('sdk webrtc skip register...', logInfo);
       return Promise.resolve();
@@ -6632,7 +6674,15 @@ class WebRTCClient extends Emitter {
     const registerOptions = this._isWeb() ? {} : { extraContactHeaderParams: ['mobility=mobile'] };
 
     const onRegisterFailed = () => {
-      logger$9.info('sdk webrtc registering failed', { tries, registerer: !!this.registerer });
+      logger$9.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);
@@ -6910,8 +6960,9 @@ class WebRTCClient extends Emitter {
     }
   }
 
-  async close() {
-    logger$9.info('sdk webrtc closing client', { userAgent: !!this.userAgent });
+  async close(force          = false) {
+    logger$9.info('sdk webrtc closing client', { userAgent: !!this.userAgent, force });
+    this.forceClosed = force;
     this._cleanupMedia();
     this.connectionPromise = null;
 
@@ -6930,7 +6981,7 @@ class WebRTCClient extends Emitter {
     this.userAgent.delegate = null;
     this.userAgent.stateChange.removeAllListeners();
 
-    await this._disconnectTransport();
+    await this._disconnectTransport(force);
 
     this._cleanupRegister();
 
@@ -8366,7 +8417,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 {
@@ -9103,6 +9162,7 @@ class WebRTCPhone extends Emitter                  {
     }
 
     callSession.answerTime = new Date();
+    this._updateCallSession(callSession);
     this.eventEmitter.emit(ON_CALL_ACCEPTED, callSession, cameraEnabled);
 
     return callSession;
@@ -9312,6 +9372,12 @@ class WebRTCPhone extends Emitter                  {
       return Promise.resolve(null);
     }
 
+    const sipSessionId = this.getSipSessionIdFromCallSession(callSession);
+    if (sipSessionId && !(sipSessionId in this.callSessions)) {
+      logger$8.warn('Call session already ended or not found, can\'t accept it.', { sipSessionId });
+      return Promise.resolve(null);
+    }
+
     if (callSession.getId() in this.acceptedSessions) {
       logger$8.warn('CallSession already accepted.', { id: callSession ? callSession.getId() : 'n/a' });
       return Promise.resolve(callSession.sipCallId);
@@ -9319,6 +9385,7 @@ class WebRTCPhone extends Emitter                  {
 
     this.shouldSendReinvite = false;
     callSession.answerTime = new Date();
+    this._updateCallSession(callSession);
     this.acceptedSessions[callSession.getId()] = true;
 
     this.eventEmitter.emit(ON_CALL_ANSWERED, callSession);
@@ -9418,7 +9485,7 @@ class WebRTCPhone extends Emitter                  {
     // Hold current session if different from the current one (we don't want 2 sessions active at the same time).
     if (this.currentSipSession && this.currentSipSession.id !== sipSession.id) {
       logger$8.info('WebRTC hold call after resume', { id: this.currentSipSession.id });
-      this.holdSipSession(this.currentSipSession, callSession);
+      this.holdSipSession(this.currentSipSession, this.currentCallSession);
     }
 
     const promise = this.unholdSipSession(sipSession, callSession, withEvent, isConference);
@@ -9629,6 +9696,7 @@ class WebRTCPhone extends Emitter                  {
     }
     const callSession = this._createOutgoingCallSession(sipSession, cameraEnabled || false);
     callSession.creationTime = new Date();
+    this._updateCallSession(callSession);
 
     this.eventEmitter.emit(ON_PLAY_PROGRESS_SOUND, this.audioOutputDeviceId, this.audioOutputVolume);
 
@@ -9770,7 +9838,7 @@ class WebRTCPhone extends Emitter                  {
     return this.client && this.client.isConference(callSession.sipCallId);
   }
 
-  async close()                {
+  async close(force          = false)                {
     logger$8.info('WebRTC close');
 
     try {
@@ -9782,7 +9850,7 @@ class WebRTCPhone extends Emitter                  {
       logger$8.error('WebRTC close, unregister error', e);
     }
 
-    this.client.close();
+    this.client.close(force);
     this.unbind();
 
     this.incomingSessions = [];
@@ -9908,6 +9976,8 @@ class WebRTCPhone extends Emitter                  {
       }
 
       callSession.creationTime = new Date();
+      this._updateCallSession(callSession);
+
       this.eventEmitter.emit(ON_CALL_INCOMING, callSession, wantsToDoVideo);
     });
 
@@ -9932,9 +10002,17 @@ class WebRTCPhone extends Emitter                  {
     });
 
     this.client.on(this.client.ACCEPTED, (sipSession         ) => {
-      logger$8.info('WebRTC call accepted', { sipId: sipSession.id });
+      const sessionId = this.getSipSessionId(sipSession);
+      const hasSession = sessionId in this.callSessions;
 
-      this._onCallAccepted(sipSession, this.client.hasVideo(this.getSipSessionId(sipSession)));
+      logger$8.info('WebRTC call accepted', { sipId: sessionId, hasSession });
+
+      if (!hasSession) {
+        logger$8.warn('Call accepted ignored, session is no longer present in the WebRtcPhone', { sessionId });
+        return;
+      }
+
+      this._onCallAccepted(sipSession, this.client.hasVideo(sessionId));
 
       if (this.audioOutputDeviceId) {
         this.client.changeAudioOutputDevice(this.audioOutputDeviceId);
@@ -9951,6 +10029,8 @@ class WebRTCPhone extends Emitter                  {
       logger$8.info('WebRTC call rejected', session.id);
       const callSession = this._createCallSession(session);
       callSession.endTime = new Date();
+      this._updateCallSession(callSession);
+
       this.eventEmitter.emit(ON_CALL_REJECTED, callSession);
     });
 
@@ -10068,9 +10148,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;
@@ -10175,6 +10260,7 @@ class WebRTCPhone extends Emitter                  {
       displayName: identity ? identity.displayName || number : number,
       startTime: fromSession ? fromSession.startTime : new Date(),
       creationTime: fromSession ? fromSession.creationTime : null,
+      answerTime: fromSession ? fromSession.answerTime : null,
       endTime: fromSession ? fromSession.endTime : null,
       answered: state === sessionState.SessionState.Established,
       paused: this.client.isCallHeld(sipSession),

package/lib/simple/index.js

@@ -3594,13 +3594,21 @@ class CallSession {
 
   // Retro-compatibility: `answered` was a boolean before. We can reproduce the behaviour with a getter/setter
   set answered(value         ) {
-    this.answerTime = value ? new Date() : null;
+    this.answerTime = value ? this.answerTime || new Date() : null;
   }
 
   get answered()          {
     return !!this.answerTime;
   }
 
+  toJSON() {
+    const jsonObj = { ...this };
+    // $FlowFixMe
+    jsonObj.answered = this.answered;
+
+    return jsonObj;
+  }
+
   static parseCall(call      )              {
     return new CallSession({
       callId: call.id,
@@ -4852,6 +4860,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 +5082,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 +6673,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 +6727,7 @@ class WebRTCClient extends Emitter {
                         
                                                       
                                             
+                       
 
   // sugar
                         
@@ -6751,6 +6790,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 +6912,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 +6938,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 +7224,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 +7245,7 @@ class WebRTCClient extends Emitter {
     this.userAgent.delegate = null;
     this.userAgent.stateChange.removeAllListeners();
 
-    await this._disconnectTransport();
+    await this._disconnectTransport(force);
 
     this._cleanupRegister();
 
@@ -8630,7 +8681,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 {
@@ -9367,6 +9426,7 @@ class WebRTCPhone extends Emitter                  {
     }
 
     callSession.answerTime = new Date();
+    this._updateCallSession(callSession);
     this.eventEmitter.emit(ON_CALL_ACCEPTED, callSession, cameraEnabled);
 
     return callSession;
@@ -9576,6 +9636,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);
@@ -9583,6 +9649,7 @@ class WebRTCPhone extends Emitter                  {
 
     this.shouldSendReinvite = false;
     callSession.answerTime = new Date();
+    this._updateCallSession(callSession);
     this.acceptedSessions[callSession.getId()] = true;
 
     this.eventEmitter.emit(ON_CALL_ANSWERED, callSession);
@@ -9682,7 +9749,7 @@ class WebRTCPhone extends Emitter                  {
     // Hold current session if different from the current one (we don't want 2 sessions active at the same time).
     if (this.currentSipSession && this.currentSipSession.id !== sipSession.id) {
       logger$7.info('WebRTC hold call after resume', { id: this.currentSipSession.id });
-      this.holdSipSession(this.currentSipSession, callSession);
+      this.holdSipSession(this.currentSipSession, this.currentCallSession);
     }
 
     const promise = this.unholdSipSession(sipSession, callSession, withEvent, isConference);
@@ -9893,6 +9960,7 @@ class WebRTCPhone extends Emitter                  {
     }
     const callSession = this._createOutgoingCallSession(sipSession, cameraEnabled || false);
     callSession.creationTime = new Date();
+    this._updateCallSession(callSession);
 
     this.eventEmitter.emit(ON_PLAY_PROGRESS_SOUND, this.audioOutputDeviceId, this.audioOutputVolume);
 
@@ -10034,7 +10102,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 {
@@ -10046,7 +10114,7 @@ class WebRTCPhone extends Emitter                  {
       logger$7.error('WebRTC close, unregister error', e);
     }
 
-    this.client.close();
+    this.client.close(force);
     this.unbind();
 
     this.incomingSessions = [];
@@ -10172,6 +10240,8 @@ class WebRTCPhone extends Emitter                  {
       }
 
       callSession.creationTime = new Date();
+      this._updateCallSession(callSession);
+
       this.eventEmitter.emit(ON_CALL_INCOMING, callSession, wantsToDoVideo);
     });
 
@@ -10196,9 +10266,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;
 
-      this._onCallAccepted(sipSession, this.client.hasVideo(this.getSipSessionId(sipSession)));
+      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(sessionId));
 
       if (this.audioOutputDeviceId) {
         this.client.changeAudioOutputDevice(this.audioOutputDeviceId);
@@ -10215,6 +10293,8 @@ class WebRTCPhone extends Emitter                  {
       logger$7.info('WebRTC call rejected', session.id);
       const callSession = this._createCallSession(session);
       callSession.endTime = new Date();
+      this._updateCallSession(callSession);
+
       this.eventEmitter.emit(ON_CALL_REJECTED, callSession);
     });
 
@@ -10332,9 +10412,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;
@@ -10439,6 +10524,7 @@ class WebRTCPhone extends Emitter                  {
       displayName: identity ? identity.displayName || number : number,
       startTime: fromSession ? fromSession.startTime : new Date(),
       creationTime: fromSession ? fromSession.creationTime : null,
+      answerTime: fromSession ? fromSession.answerTime : null,
       endTime: fromSession ? fromSession.endTime : null,
       answered: state === sessionState.SessionState.Established,
       paused: this.client.isCallHeld(sipSession),