@wazo/sdk 0.37.35 → 0.37.36

package/lib/simple/utils.js

@@ -396,6 +396,7 @@ const LINE_STATE = {
       
     
                                
+                        
                              
              
           
@@ -432,6 +433,7 @@ const LINE_STATE = {
                        
                                  
                          
+                       
                  
                  
                             
@@ -463,6 +465,7 @@ class Profile {
                          
                                     
                  
+                       
                                            
                  
                             
@@ -479,6 +482,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),
@@ -515,6 +519,7 @@ class Profile {
     switchboards,
     agent,
     status,
+    ringSeconds,
     sipLines,
     callPickupTargetUsers,
     onlineCallRecordEnabled,
@@ -536,6 +541,7 @@ class Profile {
     this.status = status;
     this.callPickupTargetUsers = callPickupTargetUsers;
     this.onlineCallRecordEnabled = onlineCallRecordEnabled;
+    this.ringSeconds = ringSeconds;
 
     this.sipLines = sipLines || [];
   }
@@ -3292,6 +3298,7 @@ var updateFrom = (instance     , from     ) => {
                      
                            
                        
+                      
   
 
 class CallSession {
@@ -3354,6 +3361,8 @@ class CallSession {
                      
 
                            
+
+                      
 
                       
 
@@ -3385,6 +3394,7 @@ class CallSession {
     videoRemotelyDowngraded,
     sipSession,
     answerTime,
+    conference,
   }                      ) {
     this.callId = callId;
     this.sipCallId = sipCallId;
@@ -3413,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';
@@ -3470,6 +3481,10 @@ class CallSession {
     this.screensharing = false;
   }
 
+  setIsConference(conference         ) {
+    this.conference = conference;
+  }
+
   isIncoming()          {
     return !this.isCaller && !this.answered;
   }
@@ -3546,6 +3561,10 @@ class CallSession {
     return this.sipStatus === sessionState.SessionState.Terminated;
   }
 
+  isConference()          {
+    return this.conference;
+  }
+
   getElapsedTimeInSeconds() {
     if (!this.startTime) {
       return 0;
@@ -3637,6 +3656,7 @@ class CallSession {
       cameraEnabled: false,
       dialedExtension: call.dialedExtension,
       call,
+      conference: false, // @FIXME?
     });
   }
 }
@@ -3732,7 +3752,7 @@ class Recording {
              
                            
                       
-                           
+                            
                                   
                               
                          
@@ -5932,6 +5952,10 @@ class AdHocAPIConference {
     this.conferenceId = conferenceId || '';
     this.muted = muted || false;
     this.paused = paused || false;
+
+    if (this.host) {
+      this.host.setIsConference(true);
+    }
   }
 
   async start() {
@@ -9641,7 +9665,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) {
@@ -9734,22 +9762,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);
@@ -9762,10 +9790,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;
@@ -9778,7 +9810,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')));
@@ -9799,6 +9830,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));
@@ -9811,11 +9844,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 });
 
@@ -9957,7 +9992,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);
       });
     }
@@ -9972,6 +10011,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);
 
@@ -10550,6 +10590,7 @@ class WebRTCPhone extends Emitter                  {
       recording: fromSession ? fromSession.isRecording() : false,
       recordingPaused: false, // @TODO
       sipSession,
+      conference: !!fromSession && fromSession.isConference(),
       ...extra,
     });
 
@@ -10806,16 +10847,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/web-rtc-client.js

@@ -1611,6 +1611,7 @@ const LINE_STATE = {
       
     
                                
+                        
                              
              
           
@@ -1647,6 +1648,7 @@ const LINE_STATE = {
                        
                                  
                          
+                       
                  
                  
                             
@@ -1678,6 +1680,7 @@ class Profile {
                          
                                     
                  
+                       
                                            
                  
                             
@@ -1694,6 +1697,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),
@@ -1730,6 +1734,7 @@ class Profile {
     switchboards,
     agent,
     status,
+    ringSeconds,
     sipLines,
     callPickupTargetUsers,
     onlineCallRecordEnabled,
@@ -1751,6 +1756,7 @@ class Profile {
     this.status = status;
     this.callPickupTargetUsers = callPickupTargetUsers;
     this.onlineCallRecordEnabled = onlineCallRecordEnabled;
+    this.ringSeconds = ringSeconds;
 
     this.sipLines = sipLines || [];
   }
@@ -3854,7 +3860,7 @@ class Recording {
              
                            
                       
-                           
+                            
                                   
                               
                          

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wazo/sdk",
-  "version": "0.37.35",
+  "version": "0.37.36",
   "description": "Wazo's JavaScript Software Development Kit.",
   "main": "dist/wazo-sdk.js",
   "author": "Wazo (http://wazo.io)",

package/src/domain/AdHocAPIConference.js

@@ -73,6 +73,10 @@ export default class AdHocAPIConference {
     this.conferenceId = conferenceId || '';
     this.muted = muted || false;
     this.paused = paused || false;
+
+    if (this.host) {
+      this.host.setIsConference(true);
+    }
   }
 
   async start() {

package/src/domain/CallLog.js

@@ -19,7 +19,7 @@ type CallLogResponse = {
   id: number,
   source_extension: string,
   source_name: string,
-  source_user_uuid: string,
+  source_user_uuid: ?string,
   recordings: RecordingResponse[],
   requested_extension: string,
   requested_name: string,

package/src/domain/CallSession.js

@@ -35,6 +35,7 @@ type CallSessionArguments = {
   recording: boolean,
   recordingPaused: boolean,
   sipSession?: Session,
+  conference: boolean,
 };
 
 export default class CallSession {
@@ -100,6 +101,8 @@ export default class CallSession {
 
   sipSession: Session;
 
+  conference: boolean;
+
   constructor({
     answered,
     answeredBySystem,
@@ -128,6 +131,7 @@ export default class CallSession {
     videoRemotelyDowngraded,
     sipSession,
     answerTime,
+    conference,
   }: CallSessionArguments) {
     this.callId = callId;
     this.sipCallId = sipCallId;
@@ -156,6 +160,7 @@ export default 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';
@@ -213,6 +218,10 @@ export default class CallSession {
     this.screensharing = false;
   }
 
+  setIsConference(conference: boolean) {
+    this.conference = conference;
+  }
+
   isIncoming(): boolean {
     return !this.isCaller && !this.answered;
   }
@@ -289,6 +298,10 @@ export default class CallSession {
     return this.sipStatus === SessionState.Terminated;
   }
 
+  isConference(): boolean {
+    return this.conference;
+  }
+
   getElapsedTimeInSeconds() {
     if (!this.startTime) {
       return 0;
@@ -380,6 +393,7 @@ export default class CallSession {
       cameraEnabled: false,
       dialedExtension: call.dialedExtension,
       call,
+      conference: false, // @FIXME?
     });
   }
 }

package/src/domain/Phone/WebRTCPhone.js

@@ -833,7 +833,11 @@ export default class WebRTCPhone extends Emitter implements Phone {
   accept(callSession: CallSession, cameraEnabled?: boolean): Promise<string | null> {
     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) {
@@ -926,22 +930,22 @@ export default class WebRTCPhone extends Emitter implements Phone {
     }
   }
 
-  hold(callSession: CallSession, withEvent: boolean = true, isConference: boolean = false): ?Promise<any> {
+  hold(callSession: CallSession, withEvent: boolean = true): ?Promise<any> {
     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: CallSession, withEvent: boolean = true, isConference: boolean = false): ?Promise<any> {
+  unhold(callSession: CallSession, withEvent: boolean = true): ?Promise<any> {
     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?: CallSession, isConference: boolean = false, withEvent: boolean = true): Promise<any> {
+  resume(callSession?: CallSession, withEvent: boolean = true): Promise<any> {
     logger.info('WebRTC resume called', { id: callSession ? callSession.getId() : null });
 
     const sipSession = this.findSipSession(callSession);
@@ -954,10 +958,14 @@ export default class WebRTCPhone extends Emitter implements Phone {
     // 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;
@@ -970,7 +978,6 @@ export default class WebRTCPhone extends Emitter implements Phone {
     sipSession: Session,
     callSession: ?CallSession,
     withEvent: boolean = true,
-    isConference: boolean = false,
   ): Promise<any> {
     if (!sipSession) {
       return new Promise((resolve, reject) => reject(new Error('No session to hold')));
@@ -991,6 +998,8 @@ export default class WebRTCPhone extends Emitter implements Phone {
       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));
@@ -1003,11 +1012,13 @@ export default class WebRTCPhone extends Emitter implements Phone {
     sipSession: Session,
     callSession: ?CallSession,
     withEvent: boolean = true,
-    isConference: boolean = false,
   ): Promise<any> {
     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 });
 
@@ -1149,7 +1160,11 @@ export default class WebRTCPhone extends Emitter implements Phone {
       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);
       });
     }
@@ -1164,6 +1179,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
       return Promise.resolve(null);
     }
     const callSession = this._createOutgoingCallSession(sipSession, cameraEnabled || false);
+    callSession.setIsConference(conference);
     callSession.creationTime = new Date();
     this._updateCallSession(callSession);
 
@@ -1744,6 +1760,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
       recording: fromSession ? fromSession.isRecording() : false,
       recordingPaused: false, // @TODO
       sipSession,
+      conference: !!fromSession && fromSession.isConference(),
       ...extra,
     });
 

package/src/domain/Profile.js

@@ -57,6 +57,7 @@ type ProfileResponse = {
     },
   },
   mobile_phone_number: ?string,
+  ring_seconds?: number,
   subscription_type: ?number,
   services: {
     dnd: {
@@ -93,6 +94,7 @@ type ProfileArguments = {
   mobileNumber: string,
   forwards: Array<ForwardOption>,
   doNotDisturb?: boolean,
+  ringSeconds?: number,
   state?: string,
   status: string,
   subscriptionType: ?number,
@@ -124,6 +126,7 @@ export default class Profile {
   doNotDisturb: ?boolean;
   onlineCallRecordEnabled: ?boolean;
   state: ?string;
+  ringSeconds: ?number;
   voicemail: ?{ id: number, name: string };
   status: string;
   subscriptionType: ?number;
@@ -140,6 +143,7 @@ export default 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),
@@ -176,6 +180,7 @@ export default class Profile {
     switchboards,
     agent,
     status,
+    ringSeconds,
     sipLines,
     callPickupTargetUsers,
     onlineCallRecordEnabled,
@@ -197,6 +202,7 @@ export default class Profile {
     this.status = status;
     this.callPickupTargetUsers = callPickupTargetUsers;
     this.onlineCallRecordEnabled = onlineCallRecordEnabled;
+    this.ringSeconds = ringSeconds;
 
     this.sipLines = sipLines || [];
   }

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

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

package/src/simple/Phone.js

@@ -204,16 +204,16 @@ class Phone extends Emitter {
     }
   }
 
-  hold(callSession: CallSession, isConference: boolean = false) {
-    return this.phone && this.phone.hold(callSession, true, isConference);
+  hold(callSession: CallSession) {
+    return this.phone && this.phone.hold(callSession, true);
   }
 
-  unhold(callSession: CallSession, isConference: boolean = false) {
-    return this.phone && this.phone.unhold(callSession, true, isConference);
+  unhold(callSession: CallSession) {
+    return this.phone && this.phone.unhold(callSession, true);
   }
 
-  resume(callSession: CallSession, isConference: boolean = false) {
-    return this.phone && this.phone.resume(callSession, isConference);
+  resume(callSession: CallSession) {
+    return this.phone && this.phone.resume(callSession);
   }
 
   reject(callSession: CallSession) {