@wazo/sdk 0.38.4 → 0.38.7

package/lib/domain/AdHocAPIConference.js

@@ -36,6 +36,7 @@ const RECORD_STATE_ACTIVE = 'active';
                            
                  
                      
+                     
                    
                         
                    
@@ -46,6 +47,7 @@ const RECORD_STATE_ACTIVE = 'active';
 
                       
              
+                    
                     
                     
                      
@@ -74,6 +76,7 @@ class Call {
                           
                   
                     
+                   
                   
                  
                  
@@ -98,6 +101,7 @@ class Call {
       calleeNumber: plain.peer_caller_id_number,
       dialedExtension: plain.dialed_extension,
       isCaller: plain.is_caller,
+      isVideo: plain.is_video,
       muted: plain.muted,
       onHold: plain.on_hold,
       status: plain.status,
@@ -121,6 +125,7 @@ class Call {
     calleeNumber,
     dialedExtension,
     isCaller,
+    isVideo,
     lineId,
     muted,
     onHold,
@@ -144,6 +149,7 @@ class Call {
     this.startingTime = startingTime;
     this.talkingToIds = talkingToIds || [];
     this.recording = recording;
+    this.isVideo = !!isVideo;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'Call';

package/lib/domain/Call.js

@@ -31,6 +31,7 @@ const RECORD_STATE_ACTIVE = 'active';
                            
                  
                      
+                     
                    
                         
                    
@@ -41,6 +42,7 @@ const RECORD_STATE_ACTIVE = 'active';
 
                       
              
+                    
                     
                     
                      
@@ -69,6 +71,7 @@ class Call {
                           
                   
                     
+                   
                   
                  
                  
@@ -93,6 +96,7 @@ class Call {
       calleeNumber: plain.peer_caller_id_number,
       dialedExtension: plain.dialed_extension,
       isCaller: plain.is_caller,
+      isVideo: plain.is_video,
       muted: plain.muted,
       onHold: plain.on_hold,
       status: plain.status,
@@ -116,6 +120,7 @@ class Call {
     calleeNumber,
     dialedExtension,
     isCaller,
+    isVideo,
     lineId,
     muted,
     onHold,
@@ -139,6 +144,7 @@ class Call {
     this.startingTime = startingTime;
     this.talkingToIds = talkingToIds || [];
     this.recording = recording;
+    this.isVideo = !!isVideo;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'Call';

package/lib/domain/CallSession.js

@@ -416,7 +416,7 @@ class CallSession {
       ringing: call.isRinging(),
       answered: call.isUp(),
       answeredBySystem: call.isUp() && call.talkingToIds.length === 0,
-      cameraEnabled: false,
+      cameraEnabled: call.isVideo,
       dialedExtension: call.dialedExtension,
       call,
       conference: false, // @FIXME?

package/lib/domain/Features.js

@@ -3059,6 +3059,7 @@ const RECORD_STATE_ACTIVE = 'active';
                            
                  
                      
+                     
                    
                         
                    
@@ -3069,6 +3070,7 @@ const RECORD_STATE_ACTIVE = 'active';
 
                       
              
+                    
                     
                     
                      
@@ -3097,6 +3099,7 @@ class Call {
                           
                   
                     
+                   
                   
                  
                  
@@ -3121,6 +3124,7 @@ class Call {
       calleeNumber: plain.peer_caller_id_number,
       dialedExtension: plain.dialed_extension,
       isCaller: plain.is_caller,
+      isVideo: plain.is_video,
       muted: plain.muted,
       onHold: plain.on_hold,
       status: plain.status,
@@ -3144,6 +3148,7 @@ class Call {
     calleeNumber,
     dialedExtension,
     isCaller,
+    isVideo,
     lineId,
     muted,
     onHold,
@@ -3167,6 +3172,7 @@ class Call {
     this.startingTime = startingTime;
     this.talkingToIds = talkingToIds || [];
     this.recording = recording;
+    this.isVideo = !!isVideo;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'Call';

package/lib/domain/Phone/CTIPhone.js

@@ -1522,6 +1522,7 @@ const RECORD_STATE_ACTIVE = 'active';
                            
                  
                      
+                     
                    
                         
                    
@@ -1532,6 +1533,7 @@ const RECORD_STATE_ACTIVE = 'active';
 
                       
              
+                    
                     
                     
                      
@@ -1560,6 +1562,7 @@ class Call {
                           
                   
                     
+                   
                   
                  
                  
@@ -1584,6 +1587,7 @@ class Call {
       calleeNumber: plain.peer_caller_id_number,
       dialedExtension: plain.dialed_extension,
       isCaller: plain.is_caller,
+      isVideo: plain.is_video,
       muted: plain.muted,
       onHold: plain.on_hold,
       status: plain.status,
@@ -1607,6 +1611,7 @@ class Call {
     calleeNumber,
     dialedExtension,
     isCaller,
+    isVideo,
     lineId,
     muted,
     onHold,
@@ -1630,6 +1635,7 @@ class Call {
     this.startingTime = startingTime;
     this.talkingToIds = talkingToIds || [];
     this.recording = recording;
+    this.isVideo = !!isVideo;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'Call';
@@ -2103,7 +2109,7 @@ class CallSession {
       ringing: call.isRinging(),
       answered: call.isUp(),
       answeredBySystem: call.isUp() && call.talkingToIds.length === 0,
-      cameraEnabled: false,
+      cameraEnabled: call.isVideo,
       dialedExtension: call.dialedExtension,
       call,
       conference: false, // @FIXME?

package/lib/domain/Phone/WebRTCPhone.js

@@ -445,7 +445,7 @@ class CallSession {
       ringing: call.isRinging(),
       answered: call.isUp(),
       answeredBySystem: call.isUp() && call.talkingToIds.length === 0,
-      cameraEnabled: false,
+      cameraEnabled: call.isVideo,
       dialedExtension: call.dialedExtension,
       call,
       conference: false, // @FIXME?
@@ -1579,10 +1579,10 @@ class WebRTCPhone extends Emitter                  {
     this.audioRingVolume = volume;
   }
 
-  changeAudioInputDevice(id        ) {
+  changeAudioInputDevice(id        , force          ) {
     logger.info('WebRTC phone - changeAudio input device', { deviceId: id });
 
-    return this.client.changeAudioInputDevice(id, this.currentSipSession);
+    return this.client.changeAudioInputDevice(id, this.currentSipSession, force);
   }
 
   changeVideoInputDevice(id         ) {

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

@@ -31,6 +31,7 @@ const RECORD_STATE_ACTIVE = 'active';
                            
                  
                      
+                     
                    
                         
                    
@@ -41,6 +42,7 @@ const RECORD_STATE_ACTIVE = 'active';
 
                       
              
+                    
                     
                     
                      
@@ -69,6 +71,7 @@ class Call {
                           
                   
                     
+                   
                   
                  
                  
@@ -93,6 +96,7 @@ class Call {
       calleeNumber: plain.peer_caller_id_number,
       dialedExtension: plain.dialed_extension,
       isCaller: plain.is_caller,
+      isVideo: plain.is_video,
       muted: plain.muted,
       onHold: plain.on_hold,
       status: plain.status,
@@ -116,6 +120,7 @@ class Call {
     calleeNumber,
     dialedExtension,
     isCaller,
+    isVideo,
     lineId,
     muted,
     onHold,
@@ -139,6 +144,7 @@ class Call {
     this.startingTime = startingTime;
     this.talkingToIds = talkingToIds || [];
     this.recording = recording;
+    this.isVideo = !!isVideo;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'Call';

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

@@ -416,7 +416,7 @@ class CallSession {
       ringing: call.isRinging(),
       answered: call.isUp(),
       answeredBySystem: call.isUp() && call.talkingToIds.length === 0,
-      cameraEnabled: false,
+      cameraEnabled: call.isVideo,
       dialedExtension: call.dialedExtension,
       call,
       conference: false, // @FIXME?

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

@@ -416,7 +416,7 @@ class CallSession {
       ringing: call.isRinging(),
       answered: call.isUp(),
       answeredBySystem: call.isUp() && call.talkingToIds.length === 0,
-      cameraEnabled: false,
+      cameraEnabled: call.isVideo,
       dialedExtension: call.dialedExtension,
       call,
       conference: false, // @FIXME?

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

@@ -100,7 +100,7 @@ describe('Line domain', () => {
         username: 'ipcor1pj',
         links: [
           {
-            href: 'https://stack.dev.wazo.io/api/confd/1.1/endpoints/sip/19',
+            href: 'https://stack.example.com/api/confd/1.1/endpoints/sip/19',
             rel: 'endpoint_sip',
           },
         ],
@@ -114,7 +114,7 @@ describe('Line domain', () => {
           context: 'default',
           links: [
             {
-              href: 'https://stack.dev.wazo.io/api/confd/1.1/extensions/59',
+              href: 'https://stack.example.com/api/confd/1.1/extensions/59',
               rel: 'extensions',
             },
           ],
@@ -122,7 +122,7 @@ describe('Line domain', () => {
       ],
       links: [
         {
-          href: 'https://stack.dev.wazo.io/api/confd/1.1/lines/8',
+          href: 'https://stack.example.com/api/confd/1.1/lines/8',
           rel: 'lines',
         },
       ],
@@ -140,7 +140,7 @@ describe('Line domain', () => {
             context: 'default',
             links: [
               {
-                href: 'https://stack.dev.wazo.io/api/confd/1.1/extensions/59',
+                href: 'https://stack.example.com/api/confd/1.1/extensions/59',
                 rel: 'extensions',
               },
             ],
@@ -150,7 +150,7 @@ describe('Line domain', () => {
           id: 19,
           links: [
             {
-              href: 'https://stack.dev.wazo.io/api/confd/1.1/endpoints/sip/19',
+              href: 'https://stack.example.com/api/confd/1.1/endpoints/sip/19',
               rel: 'endpoint_sip',
             },
           ],

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

@@ -416,7 +416,7 @@ class CallSession {
       ringing: call.isRinging(),
       answered: call.isUp(),
       answeredBySystem: call.isUp() && call.talkingToIds.length === 0,
-      cameraEnabled: false,
+      cameraEnabled: call.isVideo,
       dialedExtension: call.dialedExtension,
       call,
       conference: false, // @FIXME?

package/lib/index.js

@@ -3083,6 +3083,7 @@ const RECORD_STATE_ACTIVE = 'active';
                            
                  
                      
+                     
                    
                         
                    
@@ -3093,6 +3094,7 @@ const RECORD_STATE_ACTIVE = 'active';
 
                       
              
+                    
                     
                     
                      
@@ -3121,6 +3123,7 @@ class Call {
                           
                   
                     
+                   
                   
                  
                  
@@ -3145,6 +3148,7 @@ class Call {
       calleeNumber: plain.peer_caller_id_number,
       dialedExtension: plain.dialed_extension,
       isCaller: plain.is_caller,
+      isVideo: plain.is_video,
       muted: plain.muted,
       onHold: plain.on_hold,
       status: plain.status,
@@ -3168,6 +3172,7 @@ class Call {
     calleeNumber,
     dialedExtension,
     isCaller,
+    isVideo,
     lineId,
     muted,
     onHold,
@@ -3191,6 +3196,7 @@ class Call {
     this.startingTime = startingTime;
     this.talkingToIds = talkingToIds || [];
     this.recording = recording;
+    this.isVideo = !!isVideo;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'Call';
@@ -3664,7 +3670,7 @@ class CallSession {
       ringing: call.isRinging(),
       answered: call.isUp(),
       answeredBySystem: call.isUp() && call.talkingToIds.length === 0,
-      cameraEnabled: false,
+      cameraEnabled: call.isVideo,
       dialedExtension: call.dialedExtension,
       call,
       conference: false, // @FIXME?
@@ -5730,6 +5736,24 @@ const fixSdp = (sdp        , candidates          , forcePort          = true)
   return fixed;
 };
 
+const addIcesInAllBundles = (sdp        ) => {
+  const parsedSdp = sdpParser__default['default'].parse(sdp);
+
+  const mediaWithCandidate = parsedSdp.media.find(media => !!media.candidates);
+  if (!mediaWithCandidate) {
+    return sdp;
+  }
+
+  const { candidates } = mediaWithCandidate;
+
+  parsedSdp.media = parsedSdp.media.map(media => ({
+    ...media,
+    candidates: media.candidates || candidates,
+  }));
+
+  return sdpParser__default['default'].write(parsedSdp);
+};
+
 /* global RTCSessionDescriptionInit, navigator */
 
 const wazoLogger = IssueReporter$1 ? IssueReporter$1.loggerFor('webrtc-sdh') : console;
@@ -5828,6 +5852,14 @@ class WazoSessionDescriptionHandler extends sessionDescriptionHandler.SessionDes
       wazoLogger.trace('onicecandidate', event.candidate ? event.candidate.candidate : { done: true });
       if (event.candidate) {
         this.gatheredCandidates.push(parseCandidate$1(event.candidate.candidate));
+
+        // When receiving a `srflx` or a `relay` candidate, consider the negotiation done.
+        if (event.candidate.candidate.indexOf('srflx') !== -1 || event.candidate.candidate.indexOf('relay') !== -1) {
+          wazoLogger.info('A valid ice was found, triggering ice gathering complete callback.', {
+            ice: event.candidate.candidate,
+          });
+          this.iceGatheringComplete();
+        }
       }
     };
 
@@ -5851,7 +5883,10 @@ class WazoSessionDescriptionHandler extends sessionDescriptionHandler.SessionDes
 
         // Check if we got ICEs
         if (sdp.indexOf('a=candidate') !== -1) {
-          return description;
+          return {
+            type: description.type,
+            sdp: addIcesInAllBundles(sdp),
+          };
         }
 
         wazoLogger.info('No ICE candidates found in SDP, fixing it with gathered ices', this.gatheredCandidates);
@@ -7311,11 +7346,11 @@ class WebRTCClient extends Emitter {
     });
   }
 
-  changeAudioInputDevice(id        , session          ) {
+  changeAudioInputDevice(id        , session          , force          ) {
     const currentId = this.getAudioDeviceId();
     logger$9.info('setting audio input device', { id, currentId, session: !!session });
 
-    if (id === currentId) {
+    if (!force && id === currentId) {
       return null;
     }
 
@@ -10012,10 +10047,10 @@ class WebRTCPhone extends Emitter                  {
     this.audioRingVolume = volume;
   }
 
-  changeAudioInputDevice(id        ) {
+  changeAudioInputDevice(id        , force          ) {
     logger$7.info('WebRTC phone - changeAudio input device', { deviceId: id });
 
-    return this.client.changeAudioInputDevice(id, this.currentSipSession);
+    return this.client.changeAudioInputDevice(id, this.currentSipSession, force);
   }
 
   changeVideoInputDevice(id         ) {
@@ -14240,8 +14275,7 @@ class Softphone {
     window.addEventListener('message', this._onMessage.bind(this), false);
 
     if (!server) {
-      // eslint-disable-next-line no-param-reassign
-      server = 'stack.dev.wazo.io';
+      throw new Error('`server` is not set');
     }
 
     const config         = { server };

package/lib/lib/WazoSessionDescriptionHandler.js

@@ -452,6 +452,24 @@ const fixSdp = (sdp        , candidates          , forcePort          = true)
   return fixed;
 };
 
+const addIcesInAllBundles = (sdp        ) => {
+  const parsedSdp = sdpParser__default['default'].parse(sdp);
+
+  const mediaWithCandidate = parsedSdp.media.find(media => !!media.candidates);
+  if (!mediaWithCandidate) {
+    return sdp;
+  }
+
+  const { candidates } = mediaWithCandidate;
+
+  parsedSdp.media = parsedSdp.media.map(media => ({
+    ...media,
+    candidates: media.candidates || candidates,
+  }));
+
+  return sdpParser__default['default'].write(parsedSdp);
+};
+
 /* global RTCSessionDescriptionInit, navigator */
 
 const wazoLogger = IssueReporter$1 ? IssueReporter$1.loggerFor('webrtc-sdh') : console;
@@ -550,6 +568,14 @@ class WazoSessionDescriptionHandler extends sessionDescriptionHandler.SessionDes
       wazoLogger.trace('onicecandidate', event.candidate ? event.candidate.candidate : { done: true });
       if (event.candidate) {
         this.gatheredCandidates.push(parseCandidate(event.candidate.candidate));
+
+        // When receiving a `srflx` or a `relay` candidate, consider the negotiation done.
+        if (event.candidate.candidate.indexOf('srflx') !== -1 || event.candidate.candidate.indexOf('relay') !== -1) {
+          wazoLogger.info('A valid ice was found, triggering ice gathering complete callback.', {
+            ice: event.candidate.candidate,
+          });
+          this.iceGatheringComplete();
+        }
       }
     };
 
@@ -573,7 +599,10 @@ class WazoSessionDescriptionHandler extends sessionDescriptionHandler.SessionDes
 
         // Check if we got ICEs
         if (sdp.indexOf('a=candidate') !== -1) {
-          return description;
+          return {
+            type: description.type,
+            sdp: addIcesInAllBundles(sdp),
+          };
         }
 
         wazoLogger.info('No ICE candidates found in SDP, fixing it with gathered ices', this.gatheredCandidates);

package/lib/service/CallApi.js

@@ -36,6 +36,7 @@ const RECORD_STATE_ACTIVE = 'active';
                            
                  
                      
+                     
                    
                         
                    
@@ -46,6 +47,7 @@ const RECORD_STATE_ACTIVE = 'active';
 
                       
              
+                    
                     
                     
                      
@@ -74,6 +76,7 @@ class Call {
                           
                   
                     
+                   
                   
                  
                  
@@ -98,6 +101,7 @@ class Call {
       calleeNumber: plain.peer_caller_id_number,
       dialedExtension: plain.dialed_extension,
       isCaller: plain.is_caller,
+      isVideo: plain.is_video,
       muted: plain.muted,
       onHold: plain.on_hold,
       status: plain.status,
@@ -121,6 +125,7 @@ class Call {
     calleeNumber,
     dialedExtension,
     isCaller,
+    isVideo,
     lineId,
     muted,
     onHold,
@@ -144,6 +149,7 @@ class Call {
     this.startingTime = startingTime;
     this.talkingToIds = talkingToIds || [];
     this.recording = recording;
+    this.isVideo = !!isVideo;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'Call';

package/lib/service/getApiClient.js

@@ -3059,6 +3059,7 @@ const RECORD_STATE_ACTIVE = 'active';
                            
                  
                      
+                     
                    
                         
                    
@@ -3069,6 +3070,7 @@ const RECORD_STATE_ACTIVE = 'active';
 
                       
              
+                    
                     
                     
                      
@@ -3097,6 +3099,7 @@ class Call {
                           
                   
                     
+                   
                   
                  
                  
@@ -3121,6 +3124,7 @@ class Call {
       calleeNumber: plain.peer_caller_id_number,
       dialedExtension: plain.dialed_extension,
       isCaller: plain.is_caller,
+      isVideo: plain.is_video,
       muted: plain.muted,
       onHold: plain.on_hold,
       status: plain.status,
@@ -3144,6 +3148,7 @@ class Call {
     calleeNumber,
     dialedExtension,
     isCaller,
+    isVideo,
     lineId,
     muted,
     onHold,
@@ -3167,6 +3172,7 @@ class Call {
     this.startingTime = startingTime;
     this.talkingToIds = talkingToIds || [];
     this.recording = recording;
+    this.isVideo = !!isVideo;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'Call';