@wazo/sdk 0.37.33 → 0.37.36

package/lib/index.js

@@ -1083,6 +1083,7 @@ const LINE_STATE = {
       
     
                                
+                        
                              
              
           
@@ -1119,6 +1120,7 @@ const LINE_STATE = {
                        
                                  
                          
+                       
                  
                  
                             
@@ -1150,6 +1152,7 @@ class Profile {
                          
                                     
                  
+                       
                                            
                  
                             
@@ -1166,6 +1169,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),
@@ -1202,6 +1206,7 @@ class Profile {
     switchboards,
     agent,
     status,
+    ringSeconds,
     sipLines,
     callPickupTargetUsers,
     onlineCallRecordEnabled,
@@ -1223,6 +1228,7 @@ class Profile {
     this.status = status;
     this.callPickupTargetUsers = callPickupTargetUsers;
     this.onlineCallRecordEnabled = onlineCallRecordEnabled;
+    this.ringSeconds = ringSeconds;
 
     this.sipLines = sipLines || [];
   }
@@ -2228,6 +2234,7 @@ var authMethods = (client              , baseUrl        ) => ({
                     
                        
                      
+                      
    )                    {
     const body         = {
       backend: params.backend || DEFAULT_BACKEND_USER,
@@ -2247,6 +2254,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));
   },
 
@@ -3287,6 +3298,7 @@ var updateFrom = (instance     , from     ) => {
                      
                            
                        
+                      
   
 
 class CallSession {
@@ -3349,6 +3361,8 @@ class CallSession {
                      
 
                            
+
+                      
 
                       
 
@@ -3380,6 +3394,7 @@ class CallSession {
     videoRemotelyDowngraded,
     sipSession,
     answerTime,
+    conference,
   }                      ) {
     this.callId = callId;
     this.sipCallId = sipCallId;
@@ -3408,6 +3423,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';
@@ -3465,6 +3481,10 @@ class CallSession {
     this.screensharing = false;
   }
 
+  setIsConference(conference         ) {
+    this.conference = conference;
+  }
+
   isIncoming()          {
     return !this.isCaller && !this.answered;
   }
@@ -3541,6 +3561,10 @@ class CallSession {
     return this.sipStatus === sessionState.SessionState.Terminated;
   }
 
+  isConference()          {
+    return this.conference;
+  }
+
   getElapsedTimeInSeconds() {
     if (!this.startTime) {
       return 0;
@@ -3632,6 +3656,7 @@ class CallSession {
       cameraEnabled: false,
       dialedExtension: call.dialedExtension,
       call,
+      conference: false, // @FIXME?
     });
   }
 }
@@ -3721,11 +3746,13 @@ class Recording {
                          
                                 
                             
+                                 
                    
                
              
                            
                       
+                            
                                   
                               
                          
@@ -3746,10 +3773,12 @@ class Recording {
                 
                       
                  
+                  
     
            
                       
                  
+                  
     
              
                    
@@ -3811,10 +3840,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
@@ -6236,7 +6267,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;
 
                     
                           
@@ -10092,7 +10123,11 @@ class WebRTCPhone extends Emitter                  {
   accept(callSession             , cameraEnabled          )                         {
     logger$7.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) {
@@ -10100,6 +10135,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);
@@ -10179,22 +10220,22 @@ class WebRTCPhone extends Emitter                  {
     }
   }
 
-  hold(callSession             , withEvent          = true, isConference          = false)                {
+  hold(callSession             , withEvent          = true)                {
     logger$7.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$7.info('WebRTC resume called', { id: callSession ? callSession.getId() : null });
 
     const sipSession = this.findSipSession(callSession);
@@ -10207,10 +10248,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$7.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;
@@ -10223,7 +10268,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')));
@@ -10244,6 +10288,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));
@@ -10256,11 +10302,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$7.info('WebRTC unhold sip session', { sessionId, isConference });
 
@@ -10402,7 +10450,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$7.warn('Unable to hold current session when making another call', e);
       });
     }
@@ -10417,6 +10469,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);
 
@@ -10724,9 +10777,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);
@@ -10862,9 +10923,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;
@@ -10982,6 +11048,7 @@ class WebRTCPhone extends Emitter                  {
       recording: fromSession ? fromSession.isRecording() : false,
       recordingPaused: false, // @TODO
       sipSession,
+      conference: !!fromSession && fromSession.isConference(),
       ...extra,
     });
 
@@ -11971,6 +12038,10 @@ class AdHocAPIConference {
     this.conferenceId = conferenceId || '';
     this.muted = muted || false;
     this.paused = paused || false;
+
+    if (this.host) {
+      this.host.setIsConference(true);
+    }
   }
 
   async start() {
@@ -12265,16 +12336,16 @@ class Phone extends Emitter {
     }
   }
 
-  hold(callSession             , isConference          = false) {
-    return this.phone && this.phone.hold(callSession, true, isConference);
+  hold(callSession             ) {
+    return this.phone && this.phone.hold(callSession, true);
   }
 
-  unhold(callSession             , isConference          = false) {
-    return this.phone && this.phone.unhold(callSession, true, isConference);
+  unhold(callSession             ) {
+    return this.phone && this.phone.unhold(callSession, true);
   }
 
-  resume(callSession             , isConference          = false) {
-    return this.phone && this.phone.resume(callSession, isConference);
+  resume(callSession             ) {
+    return this.phone && this.phone.resume(callSession);
   }
 
   reject(callSession             ) {

package/lib/service/CallApi.js

@@ -564,6 +564,7 @@ const LINE_STATE = {
       
     
                                
+                        
                              
              
           
@@ -600,6 +601,7 @@ const LINE_STATE = {
                        
                                  
                          
+                       
                  
                  
                             
@@ -631,6 +633,7 @@ class Profile {
                          
                                     
                  
+                       
                                            
                  
                             
@@ -647,6 +650,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),
@@ -683,6 +687,7 @@ class Profile {
     switchboards,
     agent,
     status,
+    ringSeconds,
     sipLines,
     callPickupTargetUsers,
     onlineCallRecordEnabled,
@@ -704,6 +709,7 @@ class Profile {
     this.status = status;
     this.callPickupTargetUsers = callPickupTargetUsers;
     this.onlineCallRecordEnabled = onlineCallRecordEnabled;
+    this.ringSeconds = ringSeconds;
 
     this.sipLines = sipLines || [];
   }
@@ -1751,11 +1757,13 @@ class Recording {
                          
                                 
                             
+                                 
                    
                
              
                            
                       
+                            
                                   
                               
                          
@@ -1776,10 +1784,12 @@ class Recording {
                 
                       
                  
+                  
     
            
                       
                  
+                  
     
              
                    
@@ -1841,10 +1851,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
@@ -2737,6 +2749,7 @@ var authMethods = (client              , baseUrl        ) => ({
                     
                        
                      
+                      
    )                    {
     const body         = {
       backend: params.backend || DEFAULT_BACKEND_USER,
@@ -2756,6 +2769,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));
   },
 

package/lib/service/getApiClient.js

@@ -1060,6 +1060,7 @@ const LINE_STATE = {
       
     
                                
+                        
                              
              
           
@@ -1096,6 +1097,7 @@ const LINE_STATE = {
                        
                                  
                          
+                       
                  
                  
                             
@@ -1127,6 +1129,7 @@ class Profile {
                          
                                     
                  
+                       
                                            
                  
                             
@@ -1143,6 +1146,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),
@@ -1179,6 +1183,7 @@ class Profile {
     switchboards,
     agent,
     status,
+    ringSeconds,
     sipLines,
     callPickupTargetUsers,
     onlineCallRecordEnabled,
@@ -1200,6 +1205,7 @@ class Profile {
     this.status = status;
     this.callPickupTargetUsers = callPickupTargetUsers;
     this.onlineCallRecordEnabled = onlineCallRecordEnabled;
+    this.ringSeconds = ringSeconds;
 
     this.sipLines = sipLines || [];
   }
@@ -2205,6 +2211,7 @@ var authMethods = (client              , baseUrl        ) => ({
                     
                        
                      
+                      
    )                    {
     const body         = {
       backend: params.backend || DEFAULT_BACKEND_USER,
@@ -2224,6 +2231,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));
   },
 
@@ -3292,11 +3303,13 @@ class Recording {
                          
                                 
                             
+                                 
                    
                
              
                            
                       
+                            
                                   
                               
                          
@@ -3317,10 +3330,12 @@ class Recording {
                 
                       
                  
+                  
     
            
                       
                  
+                  
     
              
                    
@@ -3382,10 +3397,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