@wazo/sdk 0.37.0 → 0.37.4

package/src/domain/Phone/WebRTCPhone.js

@@ -200,7 +200,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
     });
 
     if (!sipSession) {
-      return null;
+      return false;
     }
 
     // $FlowFixMe
@@ -210,19 +210,17 @@ export default class WebRTCPhone extends Emitter implements Phone {
     // Downgrade
     if (constraints && !isUpgrade) {
       // No reinvite needed
-      return this._downgradeToAudio(callSession);
+      this._downgradeToAudio(callSession);
+      return false;
     }
 
     if (isUpgrade) {
       const shouldReinvite = await this._upgradeToVideo(callSession, constraints, conference);
       if (!shouldReinvite) {
-        return;
+        return false;
       }
     }
 
-    // Force reinvite in SDH
-    sipSession.sessionDescriptionHandler.localMediaStreamConstraints = null;
-
     return this.client.reinvite(sipSession, constraints, conference, audioOnly);
   }
 
@@ -295,7 +293,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
   _downgradeToAudio(callSession: ?CallSession) {
     const sipSession = this.findSipSession(callSession);
     if (!sipSession) {
-      return;
+      return false;
     }
 
     // Release local video stream when downgrading to audio
@@ -499,6 +497,10 @@ export default class WebRTCPhone extends Emitter implements Phone {
       localStream.removeTrack(videoTrack);
     }
 
+    if (localStream) {
+      localStream.addTrack(screenTrack);
+    }
+
     if (sender) {
       sender.replaceTrack(screenTrack);
     }
@@ -514,6 +516,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
     }
 
     logger.info('WebRTC phone - stop screen sharing');
+    let reinvited = false;
 
     try {
       if (this.currentScreenShare.stream) {
@@ -528,7 +531,8 @@ export default class WebRTCPhone extends Emitter implements Phone {
         // When upgrading directly to screenshare (eg: we don't have a videoLocalStream to replace)
         // We have to downgrade to audio.
         const screenshareStopped = this.currentScreenShare.sender && this.currentScreenShare.hadVideo;
-        await this.sendReinvite(targetCallSession, { audio: false, video: screenshareStopped }, conference);
+        const constraints = { audio: false, video: screenshareStopped };
+        reinvited = await this.sendReinvite(targetCallSession, constraints, conference);
       }
     } catch (e) {
       console.warn(e);
@@ -542,6 +546,8 @@ export default class WebRTCPhone extends Emitter implements Phone {
     );
 
     this.currentScreenShare = null;
+
+    return reinvited;
   }
 
   async _getStreamFromConstraints(constraints: Object, conference: boolean = false): Promise<?MediaStream> {
@@ -602,6 +608,10 @@ export default class WebRTCPhone extends Emitter implements Phone {
     this.client.changeAudioOutputDevice(id);
   }
 
+  createAudioElementFor(sessionId: string) {
+    return this.client.createAudioElementFor(sessionId);
+  }
+
   changeRingDevice(id: string) {
     this.audioRingDeviceId = id;
   }
@@ -1249,6 +1259,10 @@ export default class WebRTCPhone extends Emitter implements Phone {
     return callSession ? this.client.hasLocalVideo(callSession.sipCallId) : null;
   }
 
+  hasALocalVideoTrack(callSession: CallSession) {
+    return callSession ? this.client.hasALocalVideoTrack(callSession.sipCallId) : null;
+  }
+
   getRemoteStream(callSession: CallSession): ?MediaStream {
     return callSession ? this.client.getRemoteStream(callSession.sipCallId) : null;
   }

package/src/index.js

@@ -28,6 +28,9 @@ import Room from './domain/Room';
 import CallSession from './domain/CallSession';
 import IndirectTransfer from './domain/IndirectTransfer';
 import SwitchboardCall from './domain/SwitchboardCall';
+import WebRTCPhone from './domain/Phone/WebRTCPhone';
+import CTIPhone from './domain/Phone/CTIPhone';
+import Meeting from './domain/Meeting';
 import type {
   NewContact as NewContactType,
   ContactResponse as ContactResponseType,
@@ -94,6 +97,7 @@ export default {
   ServerError,
   Call,
   CallSession,
+  CTIPhone,
   Features,
   IndirectTransfer,
   SwitchboardCall,
@@ -118,4 +122,6 @@ export default {
   LINE_STATE,
   SOCKET_EVENTS,
   Wazo,
+  WebRTCPhone,
+  Meeting,
 };

package/src/lib/WazoSessionDescriptionHandler.js

@@ -116,7 +116,9 @@ class WazoSessionDescriptionHandler extends SessionDescriptionHandler {
       .then(() => {
         if (isConference && (options.constraints && !options.constraints.video) && !('hold' in options) && !audioOnly) {
           // Add a video an empty bundle to be able to replaceTrack when joining a conference without video
-          this.peerConnection.addTransceiver('video', { streams: [this._localMediaStream], direction: 'sendrecv' });
+          if (this.peerConnection.addTransceiver) {
+            this.peerConnection.addTransceiver('video', { streams: [this._localMediaStream], direction: 'sendrecv' });
+          }
         }
       })
       .then(() => this.createLocalOfferOrAnswer(options))
@@ -143,12 +145,6 @@ class WazoSessionDescriptionHandler extends SessionDescriptionHandler {
         };
       })
       .then((sessionDescription) => this.applyModifiers(sessionDescription, modifiers))
-      .then((sessionDescription) => {
-        // Set new constraints to avoid the constraints check issue in `sdh.getLocalMediaStream` later.
-        this.localMediaStreamConstraints = options.constraints;
-
-        return sessionDescription;
-      })
       .then((sessionDescription) => ({ body: sessionDescription.sdp, contentType: 'application/sdp' }))
       .catch((error) => {
         wazoLogger.error('error when creating media', error);
@@ -343,6 +339,9 @@ class WazoSessionDescriptionHandler extends SessionDescriptionHandler {
 
         // set the transceiver direction to the answer direction
         this._peerConnection.getTransceivers().forEach((transceiver) => {
+          if (transceiver.stopped) {
+            return;
+          }
           if (transceiver.direction /* guarding, but should always be true */) {
             const { receiver } = transceiver;
             if (isConference && audioOnly && receiver.track && receiver.track.kind === 'video') {
@@ -387,10 +386,15 @@ class WazoSessionDescriptionHandler extends SessionDescriptionHandler {
       if (kind !== 'audio' && kind !== 'video') {
         throw new Error(`Unknown new track kind ${kind}.`);
       }
-      const sender = pc.getSenders().find((otherSender) => otherSender.track && otherSender.track.kind === kind);
+      const sender = pc.getSenders && pc.getSenders().find((otherSender) =>
+        otherSender.track && otherSender.track.kind === kind);
 
       // Do not reuse sender video tracks in SFU
       if (sender && (!sfu || newTrack.kind === 'audio')) {
+        if (sender.track) {
+          // eslint-disable-next-line no-param-reassign
+          newTrack.enabled = sender.track.enabled;
+        }
         trackUpdates.push(
           new Promise((resolve) => {
             this.logger.debug(`SessionDescriptionHandler.setLocalMediaStream - replacing sender ${kind} track`);
@@ -424,7 +428,11 @@ class WazoSessionDescriptionHandler extends SessionDescriptionHandler {
             // Review: could make streamless tracks a configurable option?
             // https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/addTrack#Usage_notes
             try {
-              pc.addTrack(newTrack, localStream);
+              if (pc.addTrack) {
+                pc.addTrack(newTrack, localStream);
+              } else {
+                pc.addStream(localStream);
+              }
             } catch (error) {
               this.logger.error(`SessionDescriptionHandler.setLocalMediaStream - failed to add sender ${kind} track`);
               throw error;

package/src/service/IssueReporter.js

@@ -243,7 +243,13 @@ class IssueReporter {
   }
 
   _isLevelAbove(level1: string, level2: string) {
-    return LOG_LEVELS.indexOf(level1) > LOG_LEVELS.indexOf(level2);
+    const index1 = LOG_LEVELS.indexOf(level1);
+    const index2 = LOG_LEVELS.indexOf(level2);
+    if (index1 === -1 || index2 === -1) {
+      return false;
+    }
+
+    return index1 > index2;
   }
 
   _makeCategory(category: string) {

package/src/service/__tests__/IssueReporter.test.js

@@ -41,6 +41,8 @@ describe('IssueReporter', () => {
     expect(IssueReporter._isLevelAbove('error', 'warn')).toBeTruthy();
     expect(IssueReporter._isLevelAbove('info', 'warn')).toBeFalsy();
     expect(IssueReporter._isLevelAbove('trace', 'trace')).toBeFalsy();
+    expect(IssueReporter._isLevelAbove('trace', 'something')).toBeFalsy();
+    expect(IssueReporter._isLevelAbove('something', 'trace')).toBeFalsy();
   });
 
   it('should send if verbosity is higher than required', () => {

package/src/simple/Phone.js

@@ -171,13 +171,18 @@ class Phone extends Emitter {
     return adHocConference.start();
   }
 
-  mute(callSession: CallSession) {
-    this.muteViaAPI(callSession);
+  mute(callSession: CallSession, withApi: boolean = true) {
+    if (withApi) {
+      this.muteViaAPI(callSession);
+    }
+
     return this.phone && this.phone.mute(callSession);
   }
 
-  unmute(callSession: CallSession) {
-    this.unmuteViaAPI(callSession);
+  unmute(callSession: CallSession, withApi: boolean = true) {
+    if (withApi) {
+      this.unmuteViaAPI(callSession);
+    }
 
     return this.phone && this.phone.unmute(callSession);
   }
@@ -283,6 +288,10 @@ class Phone extends Emitter {
     return this.phone && this.phone.hasLocalVideo(callSession);
   }
 
+  hasALocalVideoTrack(callSession: CallSession) {
+    return this.phone && this.phone.hasALocalVideoTrack(callSession);
+  }
+
   // @Deprecated
   getLocalMediaStream(callSession: CallSession) {
     logger.warn('Phone.getLocalMediaStream is deprecated, use Phone.getLocalStream instead');

package/src/simple/index.js

@@ -3,6 +3,7 @@ import Auth, { InvalidSubscription, InvalidAuthorization } from './Auth';
 import Phone from './Phone';
 import Websocket from './Websocket';
 import Room from './room/Room';
+import SipRoom from './room/SipRoom';
 import RemoteParticipant from './room/RemoteParticipant';
 import LocalParticipant from './room/LocalParticipant';
 import Stream from './room/Stream';
@@ -29,10 +30,13 @@ import Voicemail from '../domain/Voicemail';
 import Relocation from '../domain/Relocation';
 import ConferenceRoom from '../domain/Room';
 import CallSession from '../domain/CallSession';
+import WebRTCPhone from '../domain/Phone/WebRTCPhone';
+import CTIPhone from '../domain/Phone/CTIPhone';
 import IndirectTransfer from '../domain/IndirectTransfer';
 import SwitchboardCall from '../domain/SwitchboardCall';
 import IssueReporter from '../service/IssueReporter';
 import Features from '../domain/Features';
+import Meeting from '../domain/Meeting';
 import Checker from '../checker/Checker';
 
 const Wazo = {
@@ -40,6 +44,7 @@ const Wazo = {
   Phone,
   Websocket,
   Room,
+  SipRoom,
   RemoteParticipant,
   LocalParticipant,
   Stream,
@@ -59,6 +64,7 @@ const Wazo = {
     ServerError,
     Call,
     CallLog,
+    CTIPhone,
     Recording,
     ChatMessage,
     ChatRoom,
@@ -74,6 +80,8 @@ const Wazo = {
     CallSession,
     IndirectTransfer,
     SwitchboardCall,
+    WebRTCPhone,
+    Meeting,
   },
 
   // Api

package/src/simple/room/Participant.js

@@ -3,6 +3,7 @@ import Emitter from '../../utils/Emitter';
 import IssueReporter from '../../service/IssueReporter';
 
 import Room, { SIGNAL_TYPE_PARTICIPANT_UPDATE } from './Room';
+import Contact from '../../domain/Contact';
 
 const logger = IssueReporter.loggerFor('room');
 
@@ -38,6 +39,7 @@ class Participant extends Emitter {
   ON_RESUME: string;
 
   /**
+   * @param room Room The room where the participant is
    * @param rawParticipant string Participant sent via the Wazo WS
    * @param extra Object extra status of the participant
    */
@@ -267,6 +269,11 @@ class Participant extends Emitter {
     // Poor man's object comparison
     if (typeof status.extra !== 'undefined' && JSON.stringify(this.extra) !== JSON.stringify(status.extra)) {
       this.extra = { ...this.extra, ...status.extra };
+
+      if (this.extra.contact && !(this.extra.contact instanceof Contact)) {
+        this.extra.contact = new Contact(this.extra.contact);
+      }
+
       this.triggerUpdate(this.ON_EXTRA_CHANGE, broadcast);
     }
   }