@wazo/sdk 0.37.33 → 0.37.36

package/lib/domain/Phone/WebRTCPhone.js

@@ -90,6 +90,7 @@ var updateFrom = (instance     , from     ) => {
                      
                            
                        
+                      
   
 
 class CallSession {
@@ -152,6 +153,8 @@ class CallSession {
                      
 
                            
+
+                      
 
                       
 
@@ -183,6 +186,7 @@ class CallSession {
     videoRemotelyDowngraded,
     sipSession,
     answerTime,
+    conference,
   }                      ) {
     this.callId = callId;
     this.sipCallId = sipCallId;
@@ -211,6 +215,7 @@ class CallSession {
     this.videoRemotelyDowngraded = videoRemotelyDowngraded;
     this.sipSession = sipSession;
     this.answerTime = answerTime || this.answerTime;
+    this.conference = conference;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'CallSession';
@@ -268,6 +273,10 @@ class CallSession {
     this.screensharing = false;
   }
 
+  setIsConference(conference         ) {
+    this.conference = conference;
+  }
+
   isIncoming()          {
     return !this.isCaller && !this.answered;
   }
@@ -344,6 +353,10 @@ class CallSession {
     return this.sipStatus === sessionState.SessionState.Terminated;
   }
 
+  isConference()          {
+    return this.conference;
+  }
+
   getElapsedTimeInSeconds() {
     if (!this.startTime) {
       return 0;
@@ -435,6 +448,7 @@ class CallSession {
       cameraEnabled: false,
       dialedExtension: call.dialedExtension,
       call,
+      conference: false, // @FIXME?
     });
   }
 }
@@ -1723,7 +1737,11 @@ class WebRTCPhone extends Emitter                  {
   accept(callSession             , cameraEnabled          )                         {
     logger.info('WebRTC phone - accept call', { id: callSession ? callSession.getId() : 'n/a', cameraEnabled });
     if (this.currentSipSession) {
-      this.holdSipSession(this.currentSipSession, this.currentCallSession, true);
+      this.holdSipSession(
+        this.currentSipSession,
+        this.currentCallSession,
+        true,
+      );
     }
 
     if (!callSession) {
@@ -1731,6 +1749,12 @@ class WebRTCPhone extends Emitter                  {
       return Promise.resolve(null);
     }
 
+    const sipSessionId = this.getSipSessionIdFromCallSession(callSession);
+    if (sipSessionId && !(sipSessionId in this.callSessions)) {
+      logger.warn('Call session already ended or not found, can\'t accept it.', { sipSessionId });
+      return Promise.resolve(null);
+    }
+
     if (callSession.getId() in this.acceptedSessions) {
       logger.warn('CallSession already accepted.', { id: callSession ? callSession.getId() : 'n/a' });
       return Promise.resolve(callSession.sipCallId);
@@ -1810,22 +1834,22 @@ class WebRTCPhone extends Emitter                  {
     }
   }
 
-  hold(callSession             , withEvent          = true, isConference          = false)                {
+  hold(callSession             , withEvent          = true)                {
     logger.info('WebRTC hold', { id: callSession.getId() });
 
     const sipSession = this.findSipSession(callSession);
 
-    return sipSession ? this.holdSipSession(sipSession, callSession, withEvent, isConference) : null;
+    return sipSession ? this.holdSipSession(sipSession, callSession, withEvent) : null;
   }
 
   // @Deprecated
-  unhold(callSession             , withEvent          = true, isConference          = false)                {
+  unhold(callSession             , withEvent          = true)                {
     console.warn('Please note that `phone.unhold()` is being deprecated; `phone.resume()` is the preferred method');
 
-    return this.resume(callSession, isConference, withEvent);
+    return this.resume(callSession, withEvent);
   }
 
-  resume(callSession              , isConference          = false, withEvent          = true)               {
+  resume(callSession              , withEvent          = true)               {
     logger.info('WebRTC resume called', { id: callSession ? callSession.getId() : null });
 
     const sipSession = this.findSipSession(callSession);
@@ -1838,10 +1862,14 @@ 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.info('WebRTC hold call after resume', { id: this.currentSipSession.id });
-      this.holdSipSession(this.currentSipSession, this.currentCallSession);
+      this.holdSipSession(
+        this.currentSipSession,
+        this.currentCallSession,
+        withEvent,
+      );
     }
 
-    const promise = this.unholdSipSession(sipSession, callSession, withEvent, isConference);
+    const promise = this.unholdSipSession(sipSession, callSession, withEvent);
     this.currentSipSession = sipSession;
     if (callSession) {
       this.currentCallSession = callSession;
@@ -1854,7 +1882,6 @@ class WebRTCPhone extends Emitter                  {
     sipSession         ,
     callSession              ,
     withEvent          = true,
-    isConference          = false,
   )               {
     if (!sipSession) {
       return new Promise((resolve, reject) => reject(new Error('No session to hold')));
@@ -1875,6 +1902,8 @@ class WebRTCPhone extends Emitter                  {
       await this.client.downgradeToAudio(sipSession);
     }
 
+    const isConference = !!callSession && callSession.isConference();
+
     const promise = this.client.hold(sipSession, isConference, hasVideo);
     if (withEvent) {
       this.eventEmitter.emit(ON_CALL_HELD, this._createCallSession(sipSession, callSession));
@@ -1887,11 +1916,13 @@ class WebRTCPhone extends Emitter                  {
     sipSession         ,
     callSession              ,
     withEvent          = true,
-    isConference          = false,
   )               {
     if (!sipSession) {
       return new Promise((resolve, reject) => reject(new Error('No session to unhold')));
     }
+
+    const isConference = !!callSession && callSession.isConference();
+
     const sessionId = this.getSipSessionId(sipSession);
     logger.info('WebRTC unhold sip session', { sessionId, isConference });
 
@@ -2033,7 +2064,11 @@ class WebRTCPhone extends Emitter                  {
       await this.client.register();
     }
     if (this.currentSipSession) {
-      this.holdSipSession(this.currentSipSession, this.currentCallSession, true).catch(e => {
+      this.holdSipSession(
+        this.currentSipSession,
+        this.currentCallSession,
+        true,
+      ).catch(e => {
         logger.warn('Unable to hold current session when making another call', e);
       });
     }
@@ -2048,6 +2083,7 @@ class WebRTCPhone extends Emitter                  {
       return Promise.resolve(null);
     }
     const callSession = this._createOutgoingCallSession(sipSession, cameraEnabled || false);
+    callSession.setIsConference(conference);
     callSession.creationTime = new Date();
     this._updateCallSession(callSession);
 
@@ -2355,9 +2391,17 @@ class WebRTCPhone extends Emitter                  {
     });
 
     this.client.on(this.client.ACCEPTED, (sipSession         ) => {
-      logger.info('WebRTC call accepted', { sipId: sipSession.id });
+      const sessionId = this.getSipSessionId(sipSession);
+      const hasSession = sessionId in this.callSessions;
+
+      logger.info('WebRTC call accepted', { sipId: sessionId, hasSession });
+
+      if (!hasSession) {
+        logger.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);
@@ -2493,9 +2537,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;
@@ -2613,6 +2662,7 @@ class WebRTCPhone extends Emitter                  {
       recording: fromSession ? fromSession.isRecording() : false,
       recordingPaused: false, // @TODO
       sipSession,
+      conference: !!fromSession && fromSession.isConference(),
       ...extra,
     });
 

package/lib/domain/Profile.js

@@ -203,6 +203,7 @@ const LINE_STATE = {
       
     
                                
+                        
                              
              
           
@@ -239,6 +240,7 @@ const LINE_STATE = {
                        
                                  
                          
+                       
                  
                  
                             
@@ -270,6 +272,7 @@ class Profile {
                          
                                     
                  
+                       
                                            
                  
                             
@@ -286,6 +289,7 @@ class Profile {
       lines: plain.lines.map(line => Line.parse(line)),
       username: plain.username,
       mobileNumber: plain.mobile_phone_number || '',
+      ringSeconds: plain.ring_seconds,
       forwards: [
         ForwardOption.parse(plain.forwards.unconditional, FORWARD_KEYS.UNCONDITIONAL),
         ForwardOption.parse(plain.forwards.noanswer, FORWARD_KEYS.NO_ANSWER),
@@ -322,6 +326,7 @@ class Profile {
     switchboards,
     agent,
     status,
+    ringSeconds,
     sipLines,
     callPickupTargetUsers,
     onlineCallRecordEnabled,
@@ -343,6 +348,7 @@ class Profile {
     this.status = status;
     this.callPickupTargetUsers = callPickupTargetUsers;
     this.onlineCallRecordEnabled = onlineCallRecordEnabled;
+    this.ringSeconds = ringSeconds;
 
     this.sipLines = sipLines || [];
   }

package/lib/domain/__tests__/CallLog.test.js

@@ -93,11 +93,13 @@ class Recording {
                          
                                 
                             
+                                 
                    
                
              
                            
                       
+                            
                                   
                               
                          
@@ -118,10 +120,12 @@ class Recording {
                 
                       
                  
+                  
     
            
                       
                  
+                  
     
              
                    
@@ -183,10 +187,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
@@ -329,8 +335,10 @@ describe('CallLog domain', () => {
           call_direction: 'outbound',
           source_extension: '8020',
           source_name: 'Jonathan Lessard',
+          source_user_uuid: '123',
           destination_extension: '4182250459',
           destination_name: null,
+          destination_user_uuid: '456',
           duration: 4,
           start: '2017-08-06T13:50:55.819057+00:00',
           end: '2017-08-08T13:51:23.822529+00:00',
@@ -361,10 +369,12 @@ describe('CallLog domain', () => {
         destination: {
           extension: '4182250459',
           name: '',
+          uuid: '456',
         },
         source: {
           extension: '8020',
           name: 'Jonathan Lessard',
+          uuid: '123',
         },
         id: 215,
         duration: 4000,

package/lib/domain/__tests__/CallSession.test.js

@@ -61,6 +61,7 @@ var updateFrom = (instance     , from     ) => {
                      
                            
                        
+                      
   
 
 class CallSession {
@@ -123,6 +124,8 @@ class CallSession {
                      
 
                            
+
+                      
 
                       
 
@@ -154,6 +157,7 @@ class CallSession {
     videoRemotelyDowngraded,
     sipSession,
     answerTime,
+    conference,
   }                      ) {
     this.callId = callId;
     this.sipCallId = sipCallId;
@@ -182,6 +186,7 @@ class CallSession {
     this.videoRemotelyDowngraded = videoRemotelyDowngraded;
     this.sipSession = sipSession;
     this.answerTime = answerTime || this.answerTime;
+    this.conference = conference;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'CallSession';
@@ -239,6 +244,10 @@ class CallSession {
     this.screensharing = false;
   }
 
+  setIsConference(conference         ) {
+    this.conference = conference;
+  }
+
   isIncoming()          {
     return !this.isCaller && !this.answered;
   }
@@ -315,6 +324,10 @@ class CallSession {
     return this.sipStatus === sessionState.SessionState.Terminated;
   }
 
+  isConference()          {
+    return this.conference;
+  }
+
   getElapsedTimeInSeconds() {
     if (!this.startTime) {
       return 0;
@@ -406,6 +419,7 @@ class CallSession {
       cameraEnabled: false,
       dialedExtension: call.dialedExtension,
       call,
+      conference: false, // @FIXME?
     });
   }
 }

package/lib/domain/__tests__/IndirectTransfer.test.js

@@ -61,6 +61,7 @@ var updateFrom = (instance     , from     ) => {
                      
                            
                        
+                      
   
 
 class CallSession {
@@ -123,6 +124,8 @@ class CallSession {
                      
 
                            
+
+                      
 
                       
 
@@ -154,6 +157,7 @@ class CallSession {
     videoRemotelyDowngraded,
     sipSession,
     answerTime,
+    conference,
   }                      ) {
     this.callId = callId;
     this.sipCallId = sipCallId;
@@ -182,6 +186,7 @@ class CallSession {
     this.videoRemotelyDowngraded = videoRemotelyDowngraded;
     this.sipSession = sipSession;
     this.answerTime = answerTime || this.answerTime;
+    this.conference = conference;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'CallSession';
@@ -239,6 +244,10 @@ class CallSession {
     this.screensharing = false;
   }
 
+  setIsConference(conference         ) {
+    this.conference = conference;
+  }
+
   isIncoming()          {
     return !this.isCaller && !this.answered;
   }
@@ -315,6 +324,10 @@ class CallSession {
     return this.sipStatus === sessionState.SessionState.Terminated;
   }
 
+  isConference()          {
+    return this.conference;
+  }
+
   getElapsedTimeInSeconds() {
     if (!this.startTime) {
       return 0;
@@ -406,6 +419,7 @@ class CallSession {
       cameraEnabled: false,
       dialedExtension: call.dialedExtension,
       call,
+      conference: false, // @FIXME?
     });
   }
 }

package/lib/domain/__tests__/Profile.test.js

@@ -193,6 +193,7 @@ const LINE_STATE = {
       
     
                                
+                        
                              
              
           
@@ -229,6 +230,7 @@ const LINE_STATE = {
                        
                                  
                          
+                       
                  
                  
                             
@@ -260,6 +262,7 @@ class Profile {
                          
                                     
                  
+                       
                                            
                  
                             
@@ -276,6 +279,7 @@ class Profile {
       lines: plain.lines.map(line => Line.parse(line)),
       username: plain.username,
       mobileNumber: plain.mobile_phone_number || '',
+      ringSeconds: plain.ring_seconds,
       forwards: [
         ForwardOption.parse(plain.forwards.unconditional, FORWARD_KEYS.UNCONDITIONAL),
         ForwardOption.parse(plain.forwards.noanswer, FORWARD_KEYS.NO_ANSWER),
@@ -312,6 +316,7 @@ class Profile {
     switchboards,
     agent,
     status,
+    ringSeconds,
     sipLines,
     callPickupTargetUsers,
     onlineCallRecordEnabled,
@@ -333,6 +338,7 @@ class Profile {
     this.status = status;
     this.callPickupTargetUsers = callPickupTargetUsers;
     this.onlineCallRecordEnabled = onlineCallRecordEnabled;
+    this.ringSeconds = ringSeconds;
 
     this.sipLines = sipLines || [];
   }

package/lib/domain/__tests__/Room.test.js

@@ -61,6 +61,7 @@ var updateFrom = (instance     , from     ) => {
                      
                            
                        
+                      
   
 
 class CallSession {
@@ -123,6 +124,8 @@ class CallSession {
                      
 
                            
+
+                      
 
                       
 
@@ -154,6 +157,7 @@ class CallSession {
     videoRemotelyDowngraded,
     sipSession,
     answerTime,
+    conference,
   }                      ) {
     this.callId = callId;
     this.sipCallId = sipCallId;
@@ -182,6 +186,7 @@ class CallSession {
     this.videoRemotelyDowngraded = videoRemotelyDowngraded;
     this.sipSession = sipSession;
     this.answerTime = answerTime || this.answerTime;
+    this.conference = conference;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'CallSession';
@@ -239,6 +244,10 @@ class CallSession {
     this.screensharing = false;
   }
 
+  setIsConference(conference         ) {
+    this.conference = conference;
+  }
+
   isIncoming()          {
     return !this.isCaller && !this.answered;
   }
@@ -315,6 +324,10 @@ class CallSession {
     return this.sipStatus === sessionState.SessionState.Terminated;
   }
 
+  isConference()          {
+    return this.conference;
+  }
+
   getElapsedTimeInSeconds() {
     if (!this.startTime) {
       return 0;
@@ -406,6 +419,7 @@ class CallSession {
       cameraEnabled: false,
       dialedExtension: call.dialedExtension,
       call,
+      conference: false, // @FIXME?
     });
   }
 }

package/lib/domain/__tests__/Session.test.js

@@ -207,6 +207,7 @@ const LINE_STATE = {
       
     
                                
+                        
                              
              
           
@@ -243,6 +244,7 @@ const LINE_STATE = {
                        
                                  
                          
+                       
                  
                  
                             
@@ -274,6 +276,7 @@ class Profile {
                          
                                     
                  
+                       
                                            
                  
                             
@@ -290,6 +293,7 @@ class Profile {
       lines: plain.lines.map(line => Line.parse(line)),
       username: plain.username,
       mobileNumber: plain.mobile_phone_number || '',
+      ringSeconds: plain.ring_seconds,
       forwards: [
         ForwardOption.parse(plain.forwards.unconditional, FORWARD_KEYS.UNCONDITIONAL),
         ForwardOption.parse(plain.forwards.noanswer, FORWARD_KEYS.NO_ANSWER),
@@ -326,6 +330,7 @@ class Profile {
     switchboards,
     agent,
     status,
+    ringSeconds,
     sipLines,
     callPickupTargetUsers,
     onlineCallRecordEnabled,
@@ -347,6 +352,7 @@ class Profile {
     this.status = status;
     this.callPickupTargetUsers = callPickupTargetUsers;
     this.onlineCallRecordEnabled = onlineCallRecordEnabled;
+    this.ringSeconds = ringSeconds;
 
     this.sipLines = sipLines || [];
   }