@wazo/sdk 0.37.35 → 0.37.38

package/esm/domain/AdHocAPIConference.js

@@ -1261,6 +1261,7 @@ const LINE_STATE = {
       
     
                                
+                        
                              
              
           
@@ -1297,6 +1298,7 @@ const LINE_STATE = {
                        
                                  
                          
+                       
                  
                  
                             
@@ -1328,6 +1330,7 @@ class Profile {
                          
                                     
                  
+                       
                                            
                  
                             
@@ -1344,6 +1347,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),
@@ -1380,6 +1384,7 @@ class Profile {
     switchboards,
     agent,
     status,
+    ringSeconds,
     sipLines,
     callPickupTargetUsers,
     onlineCallRecordEnabled,
@@ -1401,6 +1406,7 @@ class Profile {
     this.status = status;
     this.callPickupTargetUsers = callPickupTargetUsers;
     this.onlineCallRecordEnabled = onlineCallRecordEnabled;
+    this.ringSeconds = ringSeconds;
 
     this.sipLines = sipLines || [];
   }
@@ -3295,7 +3301,7 @@ class Recording {
              
                            
                       
-                           
+                            
                                   
                               
                          
@@ -4748,7 +4754,7 @@ var getApiClient = (forServer         )                => {
                      
                                         
                     
-                      
+                       
                          
                   
                    
@@ -4768,7 +4774,7 @@ class AdHocAPIConference {
 
                        
 
-                     
+                      
 
                  
 
@@ -4780,7 +4786,7 @@ class AdHocAPIConference {
     participants,
     started,
     finished,
-    startTime,
+    answerTime,
     conferenceId,
     muted,
     paused,
@@ -4790,16 +4796,20 @@ class AdHocAPIConference {
     this.participants = participants || {};
     this.started = started || false;
     this.finished = finished || false;
-    this.startTime = startTime;
+    this.answerTime = answerTime;
     this.conferenceId = conferenceId || '';
     this.muted = muted || false;
     this.paused = paused || false;
+
+    if (this.host) {
+      this.host.setIsConference(true);
+    }
   }
 
   async start() {
     this.started = true;
     // $FlowFixMe
-    this.startTime = Object.values(this.participants).length ? Object.values(this.participants)[0].startTime : null;
+    this.answerTime = Object.values(this.participants).length ? Object.values(this.participants)[0].answerTime : null;
 
     const participantIds = Object.keys(this.participants);
     const conference = await getApiClient().calld.createAdHocConference(this.host.callId, participantIds);

package/esm/domain/CallLog.js

@@ -93,7 +93,7 @@ class Recording {
              
                            
                       
-                           
+                            
                                   
                               
                          

package/esm/domain/CallSession.js

@@ -59,6 +59,7 @@ var updateFrom = (instance     , from     ) => {
                      
                            
                        
+                      
   
 
 class CallSession {
@@ -121,6 +122,8 @@ class CallSession {
                      
 
                            
+
+                      
 
                       
 
@@ -152,6 +155,7 @@ class CallSession {
     videoRemotelyDowngraded,
     sipSession,
     answerTime,
+    conference,
   }                      ) {
     this.callId = callId;
     this.sipCallId = sipCallId;
@@ -180,6 +184,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';
@@ -237,6 +242,10 @@ class CallSession {
     this.screensharing = false;
   }
 
+  setIsConference(conference         ) {
+    this.conference = conference;
+  }
+
   isIncoming()          {
     return !this.isCaller && !this.answered;
   }
@@ -313,6 +322,10 @@ class CallSession {
     return this.sipStatus === SessionState.Terminated;
   }
 
+  isConference()          {
+    return this.conference;
+  }
+
   getElapsedTimeInSeconds() {
     if (!this.startTime) {
       return 0;
@@ -404,6 +417,7 @@ class CallSession {
       cameraEnabled: false,
       dialedExtension: call.dialedExtension,
       call,
+      conference: false, // @FIXME?
     });
   }
 }

package/esm/domain/Features.js

@@ -1052,6 +1052,7 @@ const LINE_STATE = {
       
     
                                
+                        
                              
              
           
@@ -1088,6 +1089,7 @@ const LINE_STATE = {
                        
                                  
                          
+                       
                  
                  
                             
@@ -1119,6 +1121,7 @@ class Profile {
                          
                                     
                  
+                       
                                            
                  
                             
@@ -1135,6 +1138,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),
@@ -1171,6 +1175,7 @@ class Profile {
     switchboards,
     agent,
     status,
+    ringSeconds,
     sipLines,
     callPickupTargetUsers,
     onlineCallRecordEnabled,
@@ -1192,6 +1197,7 @@ class Profile {
     this.status = status;
     this.callPickupTargetUsers = callPickupTargetUsers;
     this.onlineCallRecordEnabled = onlineCallRecordEnabled;
+    this.ringSeconds = ringSeconds;
 
     this.sipLines = sipLines || [];
   }
@@ -3295,7 +3301,7 @@ class Recording {
              
                            
                       
-                           
+                            
                                   
                               
                          

package/esm/domain/Phone/CTIPhone.js

@@ -365,6 +365,7 @@ const LINE_STATE = {
       
     
                                
+                        
                              
              
           
@@ -401,6 +402,7 @@ const LINE_STATE = {
                        
                                  
                          
+                       
                  
                  
                             
@@ -432,6 +434,7 @@ class Profile {
                          
                                     
                  
+                       
                                            
                  
                             
@@ -448,6 +451,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),
@@ -484,6 +488,7 @@ class Profile {
     switchboards,
     agent,
     status,
+    ringSeconds,
     sipLines,
     callPickupTargetUsers,
     onlineCallRecordEnabled,
@@ -505,6 +510,7 @@ class Profile {
     this.status = status;
     this.callPickupTargetUsers = callPickupTargetUsers;
     this.onlineCallRecordEnabled = onlineCallRecordEnabled;
+    this.ringSeconds = ringSeconds;
 
     this.sipLines = sipLines || [];
   }
@@ -1733,6 +1739,7 @@ var updateFrom = (instance     , from     ) => {
                      
                            
                        
+                      
   
 
 class CallSession {
@@ -1795,6 +1802,8 @@ class CallSession {
                      
 
                            
+
+                      
 
                       
 
@@ -1826,6 +1835,7 @@ class CallSession {
     videoRemotelyDowngraded,
     sipSession,
     answerTime,
+    conference,
   }                      ) {
     this.callId = callId;
     this.sipCallId = sipCallId;
@@ -1854,6 +1864,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';
@@ -1911,6 +1922,10 @@ class CallSession {
     this.screensharing = false;
   }
 
+  setIsConference(conference         ) {
+    this.conference = conference;
+  }
+
   isIncoming()          {
     return !this.isCaller && !this.answered;
   }
@@ -1987,6 +2002,10 @@ class CallSession {
     return this.sipStatus === SessionState.Terminated;
   }
 
+  isConference()          {
+    return this.conference;
+  }
+
   getElapsedTimeInSeconds() {
     if (!this.startTime) {
       return 0;
@@ -2078,6 +2097,7 @@ class CallSession {
       cameraEnabled: false,
       dialedExtension: call.dialedExtension,
       call,
+      conference: false, // @FIXME?
     });
   }
 }
@@ -2173,7 +2193,7 @@ class Recording {
              
                            
                       
-                           
+                            
                                   
                               
                          

package/esm/domain/Phone/WebRTCPhone.js

@@ -81,6 +81,7 @@ var updateFrom = (instance     , from     ) => {
                      
                            
                        
+                      
   
 
 class CallSession {
@@ -143,6 +144,8 @@ class CallSession {
                      
 
                            
+
+                      
 
                       
 
@@ -174,6 +177,7 @@ class CallSession {
     videoRemotelyDowngraded,
     sipSession,
     answerTime,
+    conference,
   }                      ) {
     this.callId = callId;
     this.sipCallId = sipCallId;
@@ -202,6 +206,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';
@@ -259,6 +264,10 @@ class CallSession {
     this.screensharing = false;
   }
 
+  setIsConference(conference         ) {
+    this.conference = conference;
+  }
+
   isIncoming()          {
     return !this.isCaller && !this.answered;
   }
@@ -335,6 +344,10 @@ class CallSession {
     return this.sipStatus === SessionState.Terminated;
   }
 
+  isConference()          {
+    return this.conference;
+  }
+
   getElapsedTimeInSeconds() {
     if (!this.startTime) {
       return 0;
@@ -426,6 +439,7 @@ class CallSession {
       cameraEnabled: false,
       dialedExtension: call.dialedExtension,
       call,
+      conference: false, // @FIXME?
     });
   }
 }
@@ -1714,7 +1728,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) {
@@ -1807,22 +1825,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);
@@ -1835,10 +1853,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;
@@ -1851,7 +1873,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')));
@@ -1872,6 +1893,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));
@@ -1884,11 +1907,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 });
 
@@ -2030,7 +2055,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);
       });
     }
@@ -2045,6 +2074,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);
 
@@ -2623,6 +2653,7 @@ class WebRTCPhone extends Emitter                  {
       recording: fromSession ? fromSession.isRecording() : false,
       recordingPaused: false, // @TODO
       sipSession,
+      conference: !!fromSession && fromSession.isConference(),
       ...extra,
     });
 

package/esm/domain/Profile.js

@@ -199,6 +199,7 @@ const LINE_STATE = {
       
     
                                
+                        
                              
              
           
@@ -235,6 +236,7 @@ const LINE_STATE = {
                        
                                  
                          
+                       
                  
                  
                             
@@ -266,6 +268,7 @@ class Profile {
                          
                                     
                  
+                       
                                            
                  
                             
@@ -282,6 +285,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),
@@ -318,6 +322,7 @@ class Profile {
     switchboards,
     agent,
     status,
+    ringSeconds,
     sipLines,
     callPickupTargetUsers,
     onlineCallRecordEnabled,
@@ -339,6 +344,7 @@ class Profile {
     this.status = status;
     this.callPickupTargetUsers = callPickupTargetUsers;
     this.onlineCallRecordEnabled = onlineCallRecordEnabled;
+    this.ringSeconds = ringSeconds;
 
     this.sipLines = sipLines || [];
   }

package/esm/domain/SwitchboardCall.js

@@ -54,7 +54,7 @@ var updateFrom = (instance     , from     ) => {
                             
                         
                           
-                   
+                    
                          
                 
                           
@@ -80,7 +80,7 @@ class SwitchboardCall {
                             
                         
                           
-                   
+                    
                          
                 
                           
@@ -94,7 +94,7 @@ class SwitchboardCall {
       callerIdName: plain.caller_id_name || null,
       callerIdNumber: plain.caller_id_number || null,
       participantId: plain.participantId || null,
-      startTime: plain.startTime,
+      answerTime: plain.startTime,
       state: plain.state,
       switchboardName: plain.switchboardName,
       switchboardUuid: plain.switchboardUuid,
@@ -107,7 +107,7 @@ class SwitchboardCall {
     callerIdName,
     callerIdNumber,
     participantId,
-    startTime,
+    answerTime,
     state,
     switchboardName,
     switchboardUuid,
@@ -117,7 +117,7 @@ class SwitchboardCall {
     this.callerIdName = callerIdName;
     this.callerIdNumber = callerIdNumber;
     this.participantId = participantId;
-    this.startTime = startTime;
+    this.answerTime = answerTime;
     this.state = state;
     this.switchboardName = switchboardName;
     this.switchboardUuid = switchboardUuid;

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

@@ -93,7 +93,7 @@ class Recording {
              
                            
                       
-                           
+                            
                                   
                               
                          
@@ -329,8 +329,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 +363,12 @@ describe('CallLog domain', () => {
         destination: {
           extension: '4182250459',
           name: '',
+          uuid: '456',
         },
         source: {
           extension: '8020',
           name: 'Jonathan Lessard',
+          uuid: '123',
         },
         id: 215,
         duration: 4000,