@wazo/sdk 0.38.3 → 0.38.6

package/lib/simple/utils.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?
@@ -6308,6 +6314,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();
+        }
       }
     };
 
@@ -7791,11 +7805,11 @@ class WebRTCClient extends Emitter {
     });
   }
 
-  changeAudioInputDevice(id        , session          ) {
+  changeAudioInputDevice(id        , session          , force          ) {
     const currentId = this.getAudioDeviceId();
     logger$8.info('setting audio input device', { id, currentId, session: !!session });
 
-    if (id === currentId) {
+    if (!force && id === currentId) {
       return null;
     }
 
@@ -9591,10 +9605,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         ) {
@@ -13983,7 +13997,7 @@ const BRIDGE_ON_AGENT_RESUMED = 'bridge/BRIDGE_ON_AGENT_RESUMED';
 const BRIDGE_ON_LANGUAGE_CHANGED = 'bridge/BRIDGE_ON_LANGUAGE_CHANGED';
 const BRIDGE_ON_CALL_LOCALLY_ACCEPTED = 'bridge/BRIDGE_ON_CALL_LOCALLY_ACCEPTED';
 const BRIDGE_ON_CALL_REJECTED = 'bridge/BRIDGE_ON_CALL_REJECTED';
-const BRIDGE_ON_CALL_REMOTELY_ACCEPTED = 'bridge/BRIDGE_ON_CALL_REMOTELY_ACCEPTED';
+const BRIDGE_ON_CALL_ESTABLISHED = 'bridge/BRIDGE_ON_CALL_ESTABLISHED';
 const BRIDGE_ON_CALL_HELD = 'bridge/BRIDGE_ON_CALL_HELD';
 const BRIDGE_ON_CALL_RESUMED = 'bridge/BRIDGE_ON_CALL_RESUMED';
 const BRIDGE_ON_CALL_MUTED = 'bridge/BRIDGE_ON_CALL_MUTED';
@@ -14027,7 +14041,7 @@ class Softphone {
   onIFrameLoaded() {}
 
   onCallLocallyAnswered(call        ) {}
-  onCallRemotelyAnswered(call        ) {}
+  onCallEstablished(call        ) {}
   onOutgoingCallMade(call        ) {}
   onCallIncoming(call        ) {}
   onCallRejected(call        ) {}
@@ -14087,8 +14101,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 };
@@ -14333,8 +14346,8 @@ class Softphone {
       case BRIDGE_ON_CALL_REJECTED:
         this.onCallRejected(event.data.call);
         break;
-      case BRIDGE_ON_CALL_REMOTELY_ACCEPTED:
-        this.onCallRemotelyAnswered(event.data.call);
+      case BRIDGE_ON_CALL_ESTABLISHED:
+        this.onCallEstablished(event.data.call);
         break;
       default:
         this.onUnHandledEvent(event);

package/lib/web-rtc-client.js

@@ -887,6 +887,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();
+        }
       }
     };
 
@@ -3610,6 +3618,7 @@ const RECORD_STATE_ACTIVE = 'active';
                            
                  
                      
+                     
                    
                         
                    
@@ -3620,6 +3629,7 @@ const RECORD_STATE_ACTIVE = 'active';
 
                       
              
+                    
                     
                     
                      
@@ -3648,6 +3658,7 @@ class Call {
                           
                   
                     
+                   
                   
                  
                  
@@ -3672,6 +3683,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,
@@ -3695,6 +3707,7 @@ class Call {
     calleeNumber,
     dialedExtension,
     isCaller,
+    isVideo,
     lineId,
     muted,
     onHold,
@@ -3718,6 +3731,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';
@@ -6420,11 +6434,11 @@ class WebRTCClient extends Emitter {
     });
   }
 
-  changeAudioInputDevice(id        , session          ) {
+  changeAudioInputDevice(id        , session          , force          ) {
     const currentId = this.getAudioDeviceId();
     logger.info('setting audio input device', { id, currentId, session: !!session });
 
-    if (id === currentId) {
+    if (!force && id === currentId) {
       return null;
     }
 

package/package.json

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

package/src/__tests__/web-rtc-client.test.js

@@ -43,3 +43,53 @@ describe('WebRTC client', () => {
     expect(client.isAudioMuted(oldKindUnmuted)).toBeFalsy();
   });
 });
+
+describe('changeAudioInputDevice', () => {
+  const defaultId = 'default';
+  const deviceId = 'device1';
+  const constraints = { audio: { deviceId: { exact: defaultId } }, video: null };
+
+  const session = {
+    sessionDescriptionHandler: {
+      peerConnection: {
+        getSenders: () => [{ track: { kind: 'audio', enabled: true } }],
+      },
+    },
+  };
+
+  const stream = {};
+  const getAudioTracksMock = jest.fn(() => []);
+  Object.defineProperty(stream, 'getAudioTracks', {
+    value: getAudioTracksMock,
+  });
+
+  const getUserMediaMock = jest.fn(async () => {
+    return new Promise(resolve => {
+      resolve(stream);
+    });
+  });
+
+  Object.defineProperty(global.navigator, 'mediaDevices', {
+    value: {
+      getUserMedia: getUserMediaMock,
+    },
+  });
+
+  it('should change the audio input track if the provided id is different', async () => {
+    client.setMediaConstraints(constraints);
+    expect(client.getAudioDeviceId()).toBe(defaultId);
+    expect(client.changeAudioInputDevice(deviceId, session)).toBeTruthy();
+  });
+
+  it('should NOT change the audio input track if the provided id is the same', async () => {
+    client.setMediaConstraints(constraints);
+    expect(client.getAudioDeviceId()).toBe(defaultId);
+    expect(client.changeAudioInputDevice(defaultId, session)).toBeFalsy();
+  });
+
+  it('should change the audio input track if the provided id is the same and force param is TRUE', async () => {
+    client.setMediaConstraints(constraints);
+    expect(client.getAudioDeviceId()).toBe(defaultId);
+    expect(client.changeAudioInputDevice(defaultId, session, true)).toBeTruthy();
+  });
+});

package/src/domain/Call.js

@@ -15,6 +15,7 @@ type CallResponse = {
   dialed_extension: string,
   status: string,
   is_caller: boolean,
+  is_video?: boolean,
   line_id: ?number,
   creation_time: string,
   on_hold: boolean,
@@ -27,6 +28,7 @@ type CallArguments = {
   id: string,
   sipCallId: string,
   isCaller: boolean,
+  isVideo?: boolean,
   callerName: string,
   callerNumber: string,
   calleeName: string,
@@ -53,6 +55,7 @@ export default class Call {
   dialedExtension: string;
   lineId: ?number;
   isCaller: boolean;
+  isVideo: boolean;
   onHold: boolean;
   muted: boolean;
   status: string;
@@ -77,6 +80,7 @@ export default 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,
@@ -100,6 +104,7 @@ export default class Call {
     calleeNumber,
     dialedExtension,
     isCaller,
+    isVideo,
     lineId,
     muted,
     onHold,
@@ -123,6 +128,7 @@ export default 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/src/domain/CallSession.js

@@ -390,7 +390,7 @@ export default 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/src/domain/Phone/WebRTCPhone.js

@@ -668,10 +668,10 @@ export default class WebRTCPhone extends Emitter implements Phone {
     this.audioRingVolume = volume;
   }
 
-  changeAudioInputDevice(id: string) {
+  changeAudioInputDevice(id: string, force: ?boolean) {
     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: ?string) {

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

@@ -11,7 +11,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',
           },
         ],
@@ -25,7 +25,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',
             },
           ],
@@ -33,7 +33,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',
         },
       ],
@@ -51,7 +51,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',
               },
             ],
@@ -61,7 +61,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/src/lib/WazoSessionDescriptionHandler.js

@@ -110,6 +110,14 @@ class WazoSessionDescriptionHandler extends SessionDescriptionHandler {
       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();
+        }
       }
     };
 

package/src/simple/Softphone.js

@@ -16,7 +16,7 @@ const BRIDGE_ON_AGENT_RESUMED = 'bridge/BRIDGE_ON_AGENT_RESUMED';
 const BRIDGE_ON_LANGUAGE_CHANGED = 'bridge/BRIDGE_ON_LANGUAGE_CHANGED';
 const BRIDGE_ON_CALL_LOCALLY_ACCEPTED = 'bridge/BRIDGE_ON_CALL_LOCALLY_ACCEPTED';
 const BRIDGE_ON_CALL_REJECTED = 'bridge/BRIDGE_ON_CALL_REJECTED';
-const BRIDGE_ON_CALL_REMOTELY_ACCEPTED = 'bridge/BRIDGE_ON_CALL_REMOTELY_ACCEPTED';
+const BRIDGE_ON_CALL_ESTABLISHED = 'bridge/BRIDGE_ON_CALL_ESTABLISHED';
 const BRIDGE_ON_CALL_HELD = 'bridge/BRIDGE_ON_CALL_HELD';
 const BRIDGE_ON_CALL_RESUMED = 'bridge/BRIDGE_ON_CALL_RESUMED';
 const BRIDGE_ON_CALL_MUTED = 'bridge/BRIDGE_ON_CALL_MUTED';
@@ -60,7 +60,7 @@ class Softphone {
   onIFrameLoaded() {}
 
   onCallLocallyAnswered(call: Object) {}
-  onCallRemotelyAnswered(call: Object) {}
+  onCallEstablished(call: Object) {}
   onOutgoingCallMade(call: Object) {}
   onCallIncoming(call: Object) {}
   onCallRejected(call: Object) {}
@@ -120,8 +120,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: Object = { server };
@@ -366,8 +365,8 @@ class Softphone {
       case BRIDGE_ON_CALL_REJECTED:
         this.onCallRejected(event.data.call);
         break;
-      case BRIDGE_ON_CALL_REMOTELY_ACCEPTED:
-        this.onCallRemotelyAnswered(event.data.call);
+      case BRIDGE_ON_CALL_ESTABLISHED:
+        this.onCallEstablished(event.data.call);
         break;
       default:
         this.onUnHandledEvent(event);

package/src/web-rtc-client.js

@@ -1070,11 +1070,11 @@ export default class WebRTCClient extends Emitter {
     });
   }
 
-  changeAudioInputDevice(id: string, session: ?Inviter) {
+  changeAudioInputDevice(id: string, session: ?Inviter, force: ?boolean) {
     const currentId = this.getAudioDeviceId();
     logger.info('setting audio input device', { id, currentId, session: !!session });
 
-    if (id === currentId) {
+    if (!force && id === currentId) {
       return null;
     }