@wazo/sdk 0.37.23 → 0.37.27

package/lib/web-rtc-client.js

@@ -115,7 +115,7 @@ const logger$2 = IssueReporter$1 ? IssueReporter$1.loggerFor('api') : console;
 
 // Use a function here to be able to mock it in tests
 const realFetch = () => {
-  if (typeof document !== 'undefined') {
+  if (typeof document !== 'undefined' && window.fetch) {
     // Browser
     return window.fetch;
   }
@@ -834,11 +834,16 @@ class WazoSessionDescriptionHandler extends sessionDescriptionHandler.SessionDes
 
   // $FlowFixMe
   setRemoteSessionDescription(sessionDescription                           )                {
-    const result = super.setRemoteSessionDescription(sessionDescription);
+    try {
+      const result = super.setRemoteSessionDescription(sessionDescription);
 
-    this.eventEmitter.emit('setDescription', sessionDescription);
+      this.eventEmitter.emit('setDescription', sessionDescription);
 
-    return result;
+      return result;
+    } catch (error) {
+      this.logger.error('SessionDescriptionHandler.setRemoteSessionDescription error', error);
+      throw error;
+    }
   }
 
   // Overridden to avoid to fix ice-candidates missing in the SDP in react-native and chrome canary.
@@ -2458,7 +2463,7 @@ class Contact {
       this[key] = old[key] || this[key];
     });
 
-    if (old.lineState && !this.lineState) {
+    if (old.lineState) {
       this.lineState = old.lineState;
     }
 
@@ -3165,8 +3170,9 @@ class ExternalApp {
                              
                
                
-                 
+                
                       
+                        
  
 
 class Meeting {
@@ -3177,9 +3183,10 @@ class Meeting {
                
                
                
-                 
+                    
                       
                             
+                     
 
   static parse(plain                         )          {
     return new Meeting({
@@ -3189,8 +3196,9 @@ class Meeting {
       ownerUuids: plain.owner_uuids,
       port: plain.port,
       uuid: plain.uuid,
-      number: plain.number,
+      extension: plain.exten,
       persistent: plain.persistent,
+      creationTime: moment__default['default'](plain.creation_time).toDate(),
     });
   }
 
@@ -3212,8 +3220,9 @@ class Meeting {
     ownerUuids,
     port,
     uri,
-    number,
+    extension,
     persistent,
+    creationTime,
   }         = {}) {
     this.guestSipAuthorization = guestSipAuthorization;
     this.uri = uri;
@@ -3221,8 +3230,9 @@ class Meeting {
     this.ownerUuids = ownerUuids;
     this.port = port;
     this.uuid = uuid;
-    this.number = number;
+    this.extension = extension;
     this.persistent = persistent;
+    this.creationTime = creationTime;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'Meeting';
@@ -5714,7 +5724,7 @@ class WebRTCClient extends Emitter {
   }
 
   call(number        , enableVideo          , audioOnly          = false, conference          = false)          {
-    logger.info('sdk webrtc creating call', { number, enableVideo, audioOnly });
+    logger.info('sdk webrtc creating call', { number, enableVideo, audioOnly, conference });
     const inviterOptions         = {
       sessionDescriptionHandlerOptionsReInvite: {
         conference,
@@ -6790,6 +6800,7 @@ class WebRTCClient extends Emitter {
     const screenSharing = constraints && 'screen' in constraints ? constraints.screen : false;
     const isDesktop = constraints && 'desktop' in constraints ? constraints.desktop : false;
     const withAudio = constraints && 'audio' in constraints ? constraints.audio : true;
+    const mandatoryVideo = constraints && typeof constraints.video === 'object' ? constraints.video.mandatory : {};
 
     logger.info('Retrieving media a configuration', { enableVideo, screenSharing, isDesktop, withAudio, constraints });
 
@@ -6797,7 +6808,8 @@ class WebRTCClient extends Emitter {
       constraints: {
         // Exact constraint are not supported with `getDisplayMedia` and we must have a video=false in desktop screenshare
         audio: screenSharing ? !isDesktop : (withAudio ? this._getAudioConstraints() : false),
-        video: screenSharing ? (isDesktop ? ({ mandatory: { chromeMediaSource: 'desktop' } }) : { cursor: 'always' })
+        video: screenSharing ? (isDesktop
+          ? ({ mandatory: { chromeMediaSource: 'desktop', ...(mandatoryVideo || {}) } }) : { cursor: 'always' })
           : this._getVideoConstraints(enableVideo),
         screen: screenSharing,
         desktop: isDesktop,
@@ -7132,12 +7144,14 @@ class WebRTCClient extends Emitter {
 
     session.sessionDescriptionHandler.remoteMediaStream.onaddtrack = onTrack;
 
-    pc.oniceconnectionstatechange = () => {
-      logger.info('on ice connection state changed', { state: pc.iceConnectionState });
-      if (pc.iceConnectionState === 'disconnected') {
-        this.eventEmitter.emit(ON_DISCONNECTED);
-      }
-    };
+    if (pc) {
+      pc.oniceconnectionstatechange = () => {
+        logger.info('on ice connection state changed', { state: pc.iceConnectionState });
+        if (pc.iceConnectionState === 'disconnected') {
+          this.eventEmitter.emit(ON_DISCONNECTED);
+        }
+      };
+    }
 
     if (withEvent) {
       this.eventEmitter.emit(ACCEPTED, session, sessionDialog);
@@ -7347,13 +7361,17 @@ class WebRTCClient extends Emitter {
     const nbStats = this.sessionNetworkStats[sessionId].length;
     const lastNetworkStats = this.sessionNetworkStats[sessionId][nbStats - 1];
     const lastAudioSent = lastNetworkStats ? lastNetworkStats.audioBytesSent : 0;
+    const lastAudioContentSent = lastNetworkStats ? lastNetworkStats.audioContentSent : 0;
     const lastVideoSent = lastNetworkStats ? lastNetworkStats.videoBytesSent : 0;
     const lastAudioReceived = lastNetworkStats ? lastNetworkStats.audioBytesReceived : 0;
+    const lastAudioContentReceived = lastNetworkStats ? lastNetworkStats.audioContentReceived : 0;
     const lastVideoReceived = lastNetworkStats ? lastNetworkStats.videoBytesReceived : 0;
     const lastTransportSent = lastNetworkStats ? lastNetworkStats.transportSent : 0;
     const lastTransportReceived = lastNetworkStats ? lastNetworkStats.transportReceived : 0;
-    let audioBytesSent = 0;
-    let audioBytesReceived = 0;
+    let audioBytesSent = 0; // content + header
+    let audioBytesReceived = 0; // content + header
+    let audioContentSent = 0; // useful to detect blank call
+    let audioContentReceived = 0;
     let videoBytesSent = 0;
     let videoBytesReceived = 0;
     let transportSent = 0;
@@ -7363,6 +7381,7 @@ class WebRTCClient extends Emitter {
     stats.forEach(report => {
       if (report.type === 'outbound-rtp' && report.kind === 'audio') {
         audioBytesSent += Number(report.bytesSent) + Number(report.headerBytesSent);
+        audioContentSent += Number(report.bytesSent);
       }
       if (report.type === 'remote-outbound-rtp' && report.kind === 'audio') {
         audioBytesSent += Number(report.bytesSent);
@@ -7374,6 +7393,7 @@ class WebRTCClient extends Emitter {
         packetsLost += Number(report.packetsLost);
         networkStats.packetsReceived = Number(report.packetsReceived);
         audioBytesReceived += Number(report.bytesReceived) + Number(report.headerBytesReceived);
+        audioContentReceived += Number(report.bytesReceived);
       }
       if (report.type === 'inbound-rtp' && report.kind === 'video') {
         videoBytesReceived += Number(report.bytesReceived) + Number(report.headerBytesReceived);
@@ -7402,10 +7422,17 @@ class WebRTCClient extends Emitter {
     });
 
     networkStats.packetsLost = packetsLost;
+
     networkStats.totalAudioBytesSent = audioBytesSent;
     networkStats.audioBytesSent = audioBytesSent - lastAudioSent;
     networkStats.totalAudioBytesReceived = audioBytesReceived - lastAudioReceived;
     networkStats.audioBytesReceived = audioBytesReceived;
+
+    networkStats.totalAudioContentSent = audioContentSent;
+    networkStats.audioContentSent = audioContentSent - lastAudioContentSent;
+    networkStats.totalAudioBytesReceived = audioContentReceived - lastAudioContentReceived;
+    networkStats.audioContentReceived = audioContentReceived;
+
     networkStats.totalVideoBytesSent = videoBytesSent;
     networkStats.videoBytesSent = videoBytesSent - lastVideoSent;
     networkStats.totalVideoBytesReceived = videoBytesReceived;

package/lib/websocket-client.js

@@ -49,7 +49,7 @@ IssueReporter$1 ? IssueReporter$1.loggerFor('api') : console;
 
 // Use a function here to be able to mock it in tests
 const realFetch = () => {
-  if (typeof document !== 'undefined') {
+  if (typeof document !== 'undefined' && window.fetch) {
     // Browser
     return window.fetch;
   }

package/package.json

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

package/src/domain/Contact.js

@@ -654,7 +654,7 @@ export default class Contact {
       this[key] = old[key] || this[key];
     });
 
-    if (old.lineState && !this.lineState) {
+    if (old.lineState) {
       this.lineState = old.lineState;
     }
 

package/src/domain/Meeting.js

@@ -1,4 +1,6 @@
 // @flow
+import moment from 'moment';
+
 import newFrom from '../utils/new-from';
 
 export type MeetingCreationResponse = {
@@ -8,8 +10,9 @@ export type MeetingCreationResponse = {
   owner_uuids: Array<string>,
   port: string,
   uuid: string,
-  number: string,
+  exten: string,
   persistent: boolean,
+  creation_time: string,
 }
 
 export default class Meeting {
@@ -20,9 +23,10 @@ export default class Meeting {
   uuid: string;
   name: string;
   port: string;
-  number: string;
+  extension: string;
   persistent: boolean;
   ownerUuids: Array<string>;
+  creationTime: Date;
 
   static parse(plain: MeetingCreationResponse): Meeting {
     return new Meeting({
@@ -32,8 +36,9 @@ export default class Meeting {
       ownerUuids: plain.owner_uuids,
       port: plain.port,
       uuid: plain.uuid,
-      number: plain.number,
+      extension: plain.exten,
       persistent: plain.persistent,
+      creationTime: moment(plain.creation_time).toDate(),
     });
   }
 
@@ -55,8 +60,9 @@ export default class Meeting {
     ownerUuids,
     port,
     uri,
-    number,
+    extension,
     persistent,
+    creationTime,
   }: Object = {}) {
     this.guestSipAuthorization = guestSipAuthorization;
     this.uri = uri;
@@ -64,8 +70,9 @@ export default class Meeting {
     this.ownerUuids = ownerUuids;
     this.port = port;
     this.uuid = uuid;
-    this.number = number;
+    this.extension = extension;
     this.persistent = persistent;
+    this.creationTime = creationTime;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'Meeting';

package/src/domain/Phone/WebRTCPhone.js

@@ -203,6 +203,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
       constraints,
       audioOnly,
       conference,
+      iceRestart,
     });
 
     if (!sipSession) {
@@ -306,6 +307,11 @@ export default class WebRTCPhone extends Emitter implements Phone {
 
     this.client.downgradeToAudio(sipSession);
 
+    if (callSession) {
+      callSession.cameraEnabled = false;
+      this._updateCallSession(callSession);
+    }
+
     if (withMessage) {
       this._sendReinviteMessage(callSession, false);
     }
@@ -333,6 +339,11 @@ export default class WebRTCPhone extends Emitter implements Phone {
 
     const newStream = await this.client.upgradeToVideo(sipSession, constraints, isConference);
 
+    if (callSession) {
+      callSession.cameraEnabled = true;
+      this._updateCallSession(callSession);
+    }
+
     // If no stream is returned, it means we have to reinvite
     if (!newStream) {
       return true;
@@ -604,7 +615,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
   }
 
   _onCallAccepted(sipSession: Session, cameraEnabled: boolean): CallSession {
-    logger.info('WebRTC phone -  on call accepted', { sipId: sipSession.id, cameraEnabled });
+    logger.info('WebRTC phone - on call accepted', { sipId: sipSession.id, cameraEnabled });
 
     const callSession = this._createAcceptedCallSession(sipSession, cameraEnabled);
     this.currentSipSession = sipSession;
@@ -673,6 +684,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
   _onCallTerminated(sipSession: Session) {
     logger.info('WebRTC phone - on call terminated', { sipId: sipSession.id });
 
+    const sipSessionId = this.getSipSessionId(sipSession);
     const callSession = this._createCallSession(sipSession);
     const isCurrentSession = this.isCurrentCallSipSession(callSession);
     const isCurrentIncomingCall = callSession.is(this.getIncomingCallSession());
@@ -690,7 +702,6 @@ export default class WebRTCPhone extends Emitter implements Phone {
       }, 5);
     }
 
-    const sipSessionId = this.getSipSessionId(sipSession);
     if (sipSessionId) {
       this.removeIncomingSessions(sipSessionId);
     }
@@ -1116,7 +1127,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
   // @TODO: line is not used here
   async makeCall(number: string, line: any, cameraEnabled?: boolean,
     audioOnly: boolean = false, conference: boolean = false): Promise<?CallSession> {
-    logger.info('make WebRTC call', { number, lineId: line ? line.id : null, cameraEnabled });
+    logger.info('make WebRTC call', { number, lineId: line ? line.id : null, cameraEnabled, audioOnly, conference });
     if (!number) {
       return Promise.resolve(null);
     }
@@ -1335,8 +1346,12 @@ export default class WebRTCPhone extends Emitter implements Phone {
     }
 
     const sessionId = this.incomingSessions[0];
+    const sipSession = this.client.getSipSession(sessionId);
+    if (!sipSession) {
+      return null;
+    }
 
-    return this._createCallSession(this.client.getSipSession(sessionId));
+    return this._createCallSession(sipSession);
   }
 
   sendMessage(sipSession: Session = null, body: string, contentType: string = 'text/plain') {
@@ -1477,9 +1492,13 @@ export default class WebRTCPhone extends Emitter implements Phone {
       if (this.shouldSendReinvite && this.currentSipSession
         && this.currentSipSession.state === SessionState.Established) {
         this.shouldSendReinvite = false;
+        const pc = this.currentSipSession.sessionDescriptionHandler.peerConnection;
+        const isConference = pc ? pc.sfu : false;
+        const hasVideo = this.currentCallSession && this.currentCallSession.cameraEnabled;
+
         try {
           // Send reinvite with iceRestart
-          this.sendReinvite(this.currentCallSession, null, false, false, true);
+          this.sendReinvite(this.currentCallSession, null, isConference, !hasVideo, true);
         } catch (e) {
           logger.error('WebRTC reinvite after register, error', { message: e.message, stack: e.stack });
         }
@@ -1563,6 +1582,15 @@ export default class WebRTCPhone extends Emitter implements Phone {
     return this.client.getSipSessionId(sipSession);
   }
 
+  _updateCallSession(callSession: CallSession) {
+    const sipSession = this.findSipSession(callSession);
+    const sipSessionId = sipSession ? this.getSipSessionId(sipSession) : null;
+
+    if (sipSessionId) {
+      this.callSessions[sipSessionId] = callSession;
+    }
+  }
+
   _onMessage(message: Message) {
     if (!message || message.method !== 'MESSAGE') {
       return;

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

@@ -0,0 +1,50 @@
+// @flow
+/* global btoa */
+
+import Meeting from '../Meeting';
+
+describe('Meeting domain', () => {
+  it('can return username and secret from an base64 encrypted string', () => {
+    const USERNAME = 'username';
+    const SECRET = 'secret';
+
+    const args = {
+      guest_sip_authorization: btoa(`${USERNAME}:${SECRET}`),
+      creation_time: '',
+      ingress_http_uri: '',
+      name: '',
+      owner_uuids: [],
+      port: '',
+      uuid: '',
+      exten: '',
+      persistent: false,
+    };
+
+    const meeting = Meeting.parse(args);
+
+    const { username, secret } = meeting.getGuestSipCredentials();
+
+    expect(username).toEqual(USERNAME);
+    expect(secret).toEqual(SECRET);
+  });
+
+  it('should return a date from a string', () => {
+    const args = {
+      creation_time: '2021-12-21T15:56:42.880Z',
+      guest_sip_authorization: '',
+      ingress_http_uri: '',
+      name: '',
+      owner_uuids: [],
+      port: '',
+      uuid: '',
+      exten: '',
+      persistent: false,
+    };
+
+    const { creationTime } = Meeting.parse(args);
+
+    expect(creationTime.getDate()).toEqual(21);
+    expect(creationTime.getFullYear()).toEqual(2021);
+    expect(creationTime.getMonth()).toEqual(11);
+  });
+});

package/src/lib/WazoSessionDescriptionHandler.js

@@ -62,11 +62,16 @@ class WazoSessionDescriptionHandler extends SessionDescriptionHandler {
 
   // $FlowFixMe
   setRemoteSessionDescription(sessionDescription: RTCSessionDescriptionInit): Promise<void> {
-    const result = super.setRemoteSessionDescription(sessionDescription);
+    try {
+      const result = super.setRemoteSessionDescription(sessionDescription);
 
-    this.eventEmitter.emit('setDescription', sessionDescription);
+      this.eventEmitter.emit('setDescription', sessionDescription);
 
-    return result;
+      return result;
+    } catch (error) {
+      this.logger.error('SessionDescriptionHandler.setRemoteSessionDescription error', error);
+      throw error;
+    }
   }
 
   // Overridden to avoid to fix ice-candidates missing in the SDP in react-native and chrome canary.

package/src/utils/api-requester.js

@@ -25,7 +25,7 @@ const logger = IssueReporter ? IssueReporter.loggerFor('api') : console;
 
 // Use a function here to be able to mock it in tests
 export const realFetch = () => {
-  if (typeof document !== 'undefined') {
+  if (typeof document !== 'undefined' && window.fetch) {
     // Browser
     return window.fetch;
   }

package/src/web-rtc-client.js

@@ -453,7 +453,7 @@ export default class WebRTCClient extends Emitter {
   }
 
   call(number: string, enableVideo?: boolean, audioOnly: boolean = false, conference: boolean = false): Session {
-    logger.info('sdk webrtc creating call', { number, enableVideo, audioOnly });
+    logger.info('sdk webrtc creating call', { number, enableVideo, audioOnly, conference });
     const inviterOptions: Object = {
       sessionDescriptionHandlerOptionsReInvite: {
         conference,
@@ -1529,6 +1529,7 @@ export default class WebRTCClient extends Emitter {
     const screenSharing = constraints && 'screen' in constraints ? constraints.screen : false;
     const isDesktop = constraints && 'desktop' in constraints ? constraints.desktop : false;
     const withAudio = constraints && 'audio' in constraints ? constraints.audio : true;
+    const mandatoryVideo = constraints && typeof constraints.video === 'object' ? constraints.video.mandatory : {};
 
     logger.info('Retrieving media a configuration', { enableVideo, screenSharing, isDesktop, withAudio, constraints });
 
@@ -1536,7 +1537,8 @@ export default class WebRTCClient extends Emitter {
       constraints: {
         // Exact constraint are not supported with `getDisplayMedia` and we must have a video=false in desktop screenshare
         audio: screenSharing ? !isDesktop : (withAudio ? this._getAudioConstraints() : false),
-        video: screenSharing ? (isDesktop ? ({ mandatory: { chromeMediaSource: 'desktop' } }) : { cursor: 'always' })
+        video: screenSharing ? (isDesktop
+          ? ({ mandatory: { chromeMediaSource: 'desktop', ...(mandatoryVideo || {}) } }) : { cursor: 'always' })
           : this._getVideoConstraints(enableVideo),
         screen: screenSharing,
         desktop: isDesktop,
@@ -1871,12 +1873,14 @@ export default class WebRTCClient extends Emitter {
 
     session.sessionDescriptionHandler.remoteMediaStream.onaddtrack = onTrack;
 
-    pc.oniceconnectionstatechange = () => {
-      logger.info('on ice connection state changed', { state: pc.iceConnectionState });
-      if (pc.iceConnectionState === 'disconnected') {
-        this.eventEmitter.emit(ON_DISCONNECTED);
-      }
-    };
+    if (pc) {
+      pc.oniceconnectionstatechange = () => {
+        logger.info('on ice connection state changed', { state: pc.iceConnectionState });
+        if (pc.iceConnectionState === 'disconnected') {
+          this.eventEmitter.emit(ON_DISCONNECTED);
+        }
+      };
+    }
 
     if (withEvent) {
       this.eventEmitter.emit(ACCEPTED, session, sessionDialog);
@@ -2086,13 +2090,17 @@ export default class WebRTCClient extends Emitter {
     const nbStats = this.sessionNetworkStats[sessionId].length;
     const lastNetworkStats = this.sessionNetworkStats[sessionId][nbStats - 1];
     const lastAudioSent = lastNetworkStats ? lastNetworkStats.audioBytesSent : 0;
+    const lastAudioContentSent = lastNetworkStats ? lastNetworkStats.audioContentSent : 0;
     const lastVideoSent = lastNetworkStats ? lastNetworkStats.videoBytesSent : 0;
     const lastAudioReceived = lastNetworkStats ? lastNetworkStats.audioBytesReceived : 0;
+    const lastAudioContentReceived = lastNetworkStats ? lastNetworkStats.audioContentReceived : 0;
     const lastVideoReceived = lastNetworkStats ? lastNetworkStats.videoBytesReceived : 0;
     const lastTransportSent = lastNetworkStats ? lastNetworkStats.transportSent : 0;
     const lastTransportReceived = lastNetworkStats ? lastNetworkStats.transportReceived : 0;
-    let audioBytesSent = 0;
-    let audioBytesReceived = 0;
+    let audioBytesSent = 0; // content + header
+    let audioBytesReceived = 0; // content + header
+    let audioContentSent = 0; // useful to detect blank call
+    let audioContentReceived = 0;
     let videoBytesSent = 0;
     let videoBytesReceived = 0;
     let transportSent = 0;
@@ -2102,6 +2110,7 @@ export default class WebRTCClient extends Emitter {
     stats.forEach(report => {
       if (report.type === 'outbound-rtp' && report.kind === 'audio') {
         audioBytesSent += Number(report.bytesSent) + Number(report.headerBytesSent);
+        audioContentSent += Number(report.bytesSent);
       }
       if (report.type === 'remote-outbound-rtp' && report.kind === 'audio') {
         audioBytesSent += Number(report.bytesSent);
@@ -2113,6 +2122,7 @@ export default class WebRTCClient extends Emitter {
         packetsLost += Number(report.packetsLost);
         networkStats.packetsReceived = Number(report.packetsReceived);
         audioBytesReceived += Number(report.bytesReceived) + Number(report.headerBytesReceived);
+        audioContentReceived += Number(report.bytesReceived);
       }
       if (report.type === 'inbound-rtp' && report.kind === 'video') {
         videoBytesReceived += Number(report.bytesReceived) + Number(report.headerBytesReceived);
@@ -2141,10 +2151,17 @@ export default class WebRTCClient extends Emitter {
     });
 
     networkStats.packetsLost = packetsLost;
+
     networkStats.totalAudioBytesSent = audioBytesSent;
     networkStats.audioBytesSent = audioBytesSent - lastAudioSent;
     networkStats.totalAudioBytesReceived = audioBytesReceived - lastAudioReceived;
     networkStats.audioBytesReceived = audioBytesReceived;
+
+    networkStats.totalAudioContentSent = audioContentSent;
+    networkStats.audioContentSent = audioContentSent - lastAudioContentSent;
+    networkStats.totalAudioBytesReceived = audioContentReceived - lastAudioContentReceived;
+    networkStats.audioContentReceived = audioContentReceived;
+
     networkStats.totalVideoBytesSent = videoBytesSent;
     networkStats.videoBytesSent = videoBytesSent - lastVideoSent;
     networkStats.totalVideoBytesReceived = videoBytesReceived;