@wazo/sdk 0.37.28 → 0.37.32

package/lib/index.js

@@ -3260,6 +3260,7 @@ var updateFrom = (instance     , from     ) => {
 
                              
                     
+                     
                             
               
                  
@@ -3307,14 +3308,14 @@ class CallSession {
 
                       
 
+                     // = creationTime
+
                     
 
                  
 
                     
 
-                    
-
                             
 
                           
@@ -3378,6 +3379,7 @@ class CallSession {
     recordingPaused,
     videoRemotelyDowngraded,
     sipSession,
+    answerTime,
   }                      ) {
     this.callId = callId;
     this.sipCallId = sipCallId;
@@ -3405,6 +3407,7 @@ class CallSession {
     this.recordingPaused = recordingPaused || false;
     this.videoRemotelyDowngraded = videoRemotelyDowngraded;
     this.sipSession = sipSession;
+    this.answerTime = answerTime || this.answerTime;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'CallSession';
@@ -3435,7 +3438,7 @@ class CallSession {
   }
 
   answer() {
-    this.answered = true;
+    this.answerTime = new Date();
   }
 
   systemAnswer() {
@@ -3591,6 +3594,15 @@ class CallSession {
     return newFrom(callSession, CallSession);
   }
 
+  // Retro-compatibility: `answered` was a boolean before. We can reproduce the behaviour with a getter/setter
+  set answered(value         ) {
+    this.answerTime = value ? this.answerTime || new Date() : null;
+  }
+
+  get answered()          {
+    return !!this.answerTime;
+  }
+
   static parseCall(call      )              {
     return new CallSession({
       callId: call.id,
@@ -4925,6 +4937,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,
+    });
+  }
+
+}
+
 /*       */
 
                   
@@ -5119,6 +5159,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),
 });
 
 //      
@@ -6198,6 +6240,7 @@ const MAX_REGISTER_TRIES = 10;
                       
                
                 
+                         
                              
                     
               
@@ -6239,6 +6282,7 @@ class WebRTCClient extends Emitter {
                         
                                                       
                                             
+                       
 
   // sugar
                         
@@ -6301,6 +6345,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);
@@ -6422,6 +6467,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();
@@ -6446,7 +6493,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);
@@ -6724,8 +6779,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;
 
@@ -6744,7 +6800,7 @@ class WebRTCClient extends Emitter {
     this.userAgent.delegate = null;
     this.userAgent.stateChange.removeAllListeners();
 
-    await this._disconnectTransport();
+    await this._disconnectTransport(force);
 
     this._cleanupRegister();
 
@@ -7814,6 +7870,13 @@ class WebRTCClient extends Emitter {
   }
 
   _createWebRTCConfiguration(configOverrides         = {}) {
+    let { host } = this.config;
+    let port = this.config.port || 443;
+
+    if (this.config.websocketSip) {
+      [host, port = 443] = this.config.websocketSip.split(':');
+    }
+
     const config         = {
       authorizationUsername: this.config.authorizationUser,
       authorizationPassword: this.config.password,
@@ -7849,7 +7912,7 @@ class WebRTCClient extends Emitter {
       },
       transportOptions: {
         traceSip: configOverrides.traceSip || false,
-        wsServers: `wss://${this.config.host}:${this.config.port || 443}/api/asterisk/ws`,
+        wsServers: `wss://${host}:${port}/api/asterisk/ws`,
       },
       sessionDescriptionHandlerFactoryOptions: {
         modifiers: [replaceLocalIpModifier],
@@ -8173,7 +8236,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 {
@@ -9810,6 +9881,8 @@ class WebRTCPhone extends Emitter                  {
       this.removeIncomingSessions(sipSessionId);
     }
 
+    callSession.answerTime = new Date();
+    this._updateCallSession(callSession);
     this.eventEmitter.emit(ON_CALL_ACCEPTED, callSession, cameraEnabled);
 
     return callSession;
@@ -10025,6 +10098,8 @@ 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);
@@ -10124,7 +10199,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);
@@ -10335,6 +10410,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);
 
@@ -10476,7 +10552,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 {
@@ -10488,7 +10564,7 @@ class WebRTCPhone extends Emitter                  {
       logger$7.error('WebRTC close, unregister error', e);
     }
 
-    this.client.close();
+    this.client.close(force);
     this.unbind();
 
     this.incomingSessions = [];
@@ -10614,6 +10690,8 @@ class WebRTCPhone extends Emitter                  {
       }
 
       callSession.creationTime = new Date();
+      this._updateCallSession(callSession);
+
       this.eventEmitter.emit(ON_CALL_INCOMING, callSession, wantsToDoVideo);
     });
 
@@ -10657,6 +10735,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);
     });
 
@@ -10881,6 +10961,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/service/CallApi.js

@@ -4022,6 +4022,34 @@ class IndirectTransfer {
   }
 }
 
+//      
+
+                                     
+               
+  
+
+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,
+    });
+  }
+
+}
+
 /*       */
 
                   
@@ -4216,6 +4244,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),
 });
 
 //      

package/lib/service/getApiClient.js

@@ -4024,6 +4024,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,
+    });
+  }
+
+}
+
 /*       */
 
                   
@@ -4218,6 +4246,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),
 });
 
 //      

package/lib/simple/Auth.js

@@ -3260,6 +3260,7 @@ var updateFrom = (instance     , from     ) => {
 
                              
                     
+                     
                             
               
                  
@@ -3307,14 +3308,14 @@ class CallSession {
 
                       
 
+                     // = creationTime
+
                     
 
                  
 
                     
 
-                    
-
                             
 
                           
@@ -3378,6 +3379,7 @@ class CallSession {
     recordingPaused,
     videoRemotelyDowngraded,
     sipSession,
+    answerTime,
   }                      ) {
     this.callId = callId;
     this.sipCallId = sipCallId;
@@ -3405,6 +3407,7 @@ class CallSession {
     this.recordingPaused = recordingPaused || false;
     this.videoRemotelyDowngraded = videoRemotelyDowngraded;
     this.sipSession = sipSession;
+    this.answerTime = answerTime || this.answerTime;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'CallSession';
@@ -3435,7 +3438,7 @@ class CallSession {
   }
 
   answer() {
-    this.answered = true;
+    this.answerTime = new Date();
   }
 
   systemAnswer() {
@@ -3591,6 +3594,15 @@ class CallSession {
     return newFrom(callSession, CallSession);
   }
 
+  // Retro-compatibility: `answered` was a boolean before. We can reproduce the behaviour with a getter/setter
+  set answered(value         ) {
+    this.answerTime = value ? this.answerTime || new Date() : null;
+  }
+
+  get answered()          {
+    return !!this.answerTime;
+  }
+
   static parseCall(call      )              {
     return new CallSession({
       callId: call.id,
@@ -4842,6 +4854,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,
+    });
+  }
+
+}
+
 /*       */
 
                   
@@ -5036,6 +5076,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),
 });
 
 //      
@@ -6373,6 +6415,7 @@ const MAX_REGISTER_TRIES = 10;
                       
                
                 
+                         
                              
                     
               
@@ -6414,6 +6457,7 @@ class WebRTCClient extends Emitter {
                         
                                                       
                                             
+                       
 
   // sugar
                         
@@ -6476,6 +6520,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);
@@ -6597,6 +6642,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();
@@ -6621,7 +6668,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);
@@ -6899,8 +6954,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;
 
@@ -6919,7 +6975,7 @@ class WebRTCClient extends Emitter {
     this.userAgent.delegate = null;
     this.userAgent.stateChange.removeAllListeners();
 
-    await this._disconnectTransport();
+    await this._disconnectTransport(force);
 
     this._cleanupRegister();
 
@@ -7989,6 +8045,13 @@ class WebRTCClient extends Emitter {
   }
 
   _createWebRTCConfiguration(configOverrides         = {}) {
+    let { host } = this.config;
+    let port = this.config.port || 443;
+
+    if (this.config.websocketSip) {
+      [host, port = 443] = this.config.websocketSip.split(':');
+    }
+
     const config         = {
       authorizationUsername: this.config.authorizationUser,
       authorizationPassword: this.config.password,
@@ -8024,7 +8087,7 @@ class WebRTCClient extends Emitter {
       },
       transportOptions: {
         traceSip: configOverrides.traceSip || false,
-        wsServers: `wss://${this.config.host}:${this.config.port || 443}/api/asterisk/ws`,
+        wsServers: `wss://${host}:${port}/api/asterisk/ws`,
       },
       sessionDescriptionHandlerFactoryOptions: {
         modifiers: [replaceLocalIpModifier],
@@ -8348,7 +8411,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 {
@@ -9084,6 +9155,8 @@ class WebRTCPhone extends Emitter                  {
       this.removeIncomingSessions(sipSessionId);
     }
 
+    callSession.answerTime = new Date();
+    this._updateCallSession(callSession);
     this.eventEmitter.emit(ON_CALL_ACCEPTED, callSession, cameraEnabled);
 
     return callSession;
@@ -9299,6 +9372,8 @@ 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);
@@ -9398,7 +9473,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);
@@ -9609,6 +9684,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);
 
@@ -9750,7 +9826,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 {
@@ -9762,7 +9838,7 @@ class WebRTCPhone extends Emitter                  {
       logger$8.error('WebRTC close, unregister error', e);
     }
 
-    this.client.close();
+    this.client.close(force);
     this.unbind();
 
     this.incomingSessions = [];
@@ -9888,6 +9964,8 @@ class WebRTCPhone extends Emitter                  {
       }
 
       callSession.creationTime = new Date();
+      this._updateCallSession(callSession);
+
       this.eventEmitter.emit(ON_CALL_INCOMING, callSession, wantsToDoVideo);
     });
 
@@ -9931,6 +10009,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);
     });
 
@@ -10155,6 +10235,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),