@wazo/sdk 0.37.15 → 0.37.19

package/src/domain/Phone/WebRTCPhone.js

@@ -52,6 +52,7 @@ export const ON_MESSAGE_TRACK_UPDATED = 'onTrackUpdated';
 export const ON_NETWORK_STATS = 'onNetworkStats';
 export const ON_CHAT = 'phone/ON_CHAT';
 export const ON_SIGNAL = 'phone/ON_SIGNAL';
+export const ON_DISCONNECTED = 'onDisconnected';
 
 export const MESSAGE_TYPE_CHAT = 'message/TYPE_CHAT';
 export const MESSAGE_TYPE_SIGNAL = 'message/TYPE_SIGNAL';
@@ -91,6 +92,7 @@ export const events = [
   ON_CHAT,
   ON_SIGNAL,
   ON_NETWORK_STATS,
+  ON_DISCONNECTED,
 ];
 
 const logger = IssueReporter.loggerFor('webrtc-phone');
@@ -1445,6 +1447,11 @@ export default class WebRTCPhone extends Emitter implements Phone {
       this.eventEmitter.emit(ON_UNREGISTERED);
     });
 
+    this.client.on(this.client.ON_DISCONNECTED, () => {
+      logger.info('WebRTC disconnected');
+      this.eventEmitter.emit(ON_DISCONNECTED);
+    });
+
     this.client.on(this.client.REGISTERED, () => {
       logger.info('WebRTC registered', {
         shouldSendReinvite: this.shouldSendReinvite,

package/src/domain/Recording.js

@@ -24,7 +24,7 @@ export default class Recording {
   start: Date;
   uuid: string;
 
-  static parseMany(recordings: RecordingResponse[]): Recording[] {
+  static parseMany(recordings: RecordingResponse[] = []): Recording[] {
     return recordings.map(item => Recording.parse(item));
   }
 

package/src/service/IssueReporter.js

@@ -316,7 +316,7 @@ class IssueReporter {
           payload._retry = retry + 1;
         }
 
-        this._sendDebugToGrafana(body, retry + 1);
+        this._sendDebugToGrafana(payload, retry + 1);
       }, 5000 + retry * 1000);
     });
   }

package/src/web-rtc-client.js

@@ -69,6 +69,7 @@ const ON_REINVITE = 'reinvite';
 const ON_ERROR = 'onError';
 const ON_SCREEN_SHARING_REINVITE = 'onScreenSharingReinvite';
 const ON_NETWORK_STATS = 'onNetworkStats';
+const ON_DISCONNECTED = 'onDisconnected';
 
 export const events = [REGISTERED, UNREGISTERED, REGISTRATION_FAILED, INVITE];
 export const transportEvents = [CONNECTED, DISCONNECTED, TRANSPORT_ERROR, MESSAGE];
@@ -145,6 +146,7 @@ export default class WebRTCClient extends Emitter {
   ON_ERROR: string;
   ON_SCREEN_SHARING_REINVITE: string;
   ON_NETWORK_STATS: string;
+  ON_DISCONNECTED: string;
 
   static isAPrivateIp(ip: string): boolean {
     const regex = /^(?:10|127|172\.(?:1[6-9]|2[0-9]|3[01])|192\.168)\..*/;
@@ -210,6 +212,7 @@ export default class WebRTCClient extends Emitter {
     this.ON_ERROR = ON_ERROR;
     this.ON_SCREEN_SHARING_REINVITE = ON_SCREEN_SHARING_REINVITE;
     this.ON_NETWORK_STATS = ON_NETWORK_STATS;
+    this.ON_DISCONNECTED = ON_DISCONNECTED;
   }
 
   configureMedia(media: MediaConfig) {
@@ -811,7 +814,7 @@ export default class WebRTCClient extends Emitter {
       // We search for the last transceiver without `video-` in the mid (video- means remote transceiver)
       const transceivers = pc.getTransceivers();
       const transceiverIdx = lastIndexOf(transceivers, transceiver =>
-        transceiver.sender.track === null && transceiver.mid.indexOf('video') === -1);
+        transceiver.sender.track === null && transceiver.mid && transceiver.mid.indexOf('video') === -1);
 
       videoSender = transceiverIdx !== -1 ? transceivers[transceiverIdx].sender : null;
     } else {
@@ -1057,10 +1060,13 @@ export default class WebRTCClient extends Emitter {
       return null;
     }
 
-    // let's update the local value
-    if (this.audio && this.audio.deviceId) {
-      // $FlowFixMe
-      this.audio.deviceId.exact = id;
+    // let's update the local audio value
+    if (this.audio) {
+      this.audio = {
+        deviceId: {
+          exact: id,
+        },
+      };
     }
 
     if (session) {
@@ -1073,6 +1079,9 @@ export default class WebRTCClient extends Emitter {
         const sender = pc && pc.getSenders().find(s => audioTrack && s && s.track && s.track.kind === audioTrack.kind);
 
         if (sender) {
+          if (sender.track) {
+            audioTrack.enabled = sender.track.enabled;
+          }
           sender.replaceTrack(audioTrack);
         }
 
@@ -1097,7 +1106,7 @@ export default class WebRTCClient extends Emitter {
       return null;
     }
 
-    // let's update the local value
+    // let's update the local video value
     if (this.video) {
       this.video = {
         deviceId: {
@@ -1132,12 +1141,21 @@ export default class WebRTCClient extends Emitter {
     return navigator.mediaDevices.getUserMedia(constraints).then(async stream => {
       const videoTrack = stream.getVideoTracks()[0];
       let sender = pc && pc.getSenders().find(s => videoTrack && s && s.track && s.track.kind === videoTrack.kind);
+      let wasTrackEnabled = false;
       if (!sender) {
         sender = pc && pc.getSenders().find(s => !s.track);
       }
 
       if (sender) {
-        sender.replaceTrack(videoTrack);
+        // No video track means video not enabled
+        wasTrackEnabled = sender.track ? sender.track.enabled : false;
+        videoTrack.enabled = wasTrackEnabled;
+
+        if (!wasTrackEnabled) {
+          videoTrack.stop();
+        }
+
+        sender.replaceTrack(wasTrackEnabled ? videoTrack : null);
       }
 
       // let's update the local stream
@@ -1821,6 +1839,7 @@ export default class WebRTCClient extends Emitter {
 
     this.updateRemoteStream(this.getSipSessionId(session));
 
+    const pc = session.sessionDescriptionHandler.peerConnection;
     const onTrack = (event: any) => {
       const isAudioOnly = this._isAudioOnly(session);
       const { kind, label, readyState, id, muted } = event.track;
@@ -1840,6 +1859,12 @@ export default class WebRTCClient extends Emitter {
 
     session.sessionDescriptionHandler.remoteMediaStream.onaddtrack = onTrack;
 
+    pc.oniceconnectionstatechange = () => {
+      if (pc.iceConnectionState === 'disconnected') {
+        this.eventEmitter.emit(ON_DISCONNECTED);
+      }
+    };
+
     if (withEvent) {
       this.eventEmitter.emit(ACCEPTED, session, sessionDialog);
     }
@@ -2035,24 +2060,89 @@ export default class WebRTCClient extends Emitter {
     const session = this.getSipSession(sessionId);
 
     const stats = session ? await this.getStats(session) : null;
-    if (!stats) {
+    if (!stats || !(sessionId in this.sessionNetworkStats)) {
       return;
     }
 
+    const networkStats: Object = {
+      audioBytesSent: 0,
+      videoBytesSent: 0,
+      videoBytesReceived: 0,
+      audioBytesReceived: 0,
+    };
+    const nbStats = this.sessionNetworkStats[sessionId].length;
+    const lastNetworkStats = this.sessionNetworkStats[sessionId][nbStats - 1];
+    const lastAudioSent = lastNetworkStats ? lastNetworkStats.audioBytesSent : 0;
+    const lastVideoSent = lastNetworkStats ? lastNetworkStats.videoBytesSent : 0;
+    const lastAudioReceived = lastNetworkStats ? lastNetworkStats.audioBytesReceived : 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 videoBytesSent = 0;
+    let videoBytesReceived = 0;
+    let transportSent = 0;
+    let transportReceived = 0;
+    let packetsLost = 0;
+
     stats.forEach(report => {
-      if (report.type === 'inbound-rtp') {
-        if (report.kind === 'audio') {
-          const networkStats = {
-            packetsLost: report.packetsLost,
-            packetsReceived: report.packetsReceived,
-            jitter: report.jitter,
-          };
-
-          this.eventEmitter.emit(ON_NETWORK_STATS, session, networkStats, this.sessionNetworkStats[sessionId]);
-          this.sessionNetworkStats[sessionId].push(networkStats);
+      if (report.type === 'outbound-rtp' && report.kind === 'audio') {
+        audioBytesSent += report.bytesSent + report.headerBytesSent;
+      }
+      if (report.type === 'remote-outbound-rtp' && report.kind === 'audio') {
+        audioBytesSent += report.bytesSent;
+      }
+      if (report.type === 'outbound-rtp' && report.kind === 'video') {
+        videoBytesSent += report.bytesSent + report.headerBytesSent;
+      }
+      if (report.type === 'inbound-rtp' && report.kind === 'audio') {
+        packetsLost += report.packetsLost;
+        networkStats.packetsReceived = report.packetsReceived;
+        audioBytesReceived += report.bytesReceived + report.headerBytesReceived;
+      }
+      if (report.type === 'inbound-rtp' && report.kind === 'video') {
+        videoBytesReceived += report.bytesReceived + report.headerBytesReceived;
+      }
+      if (report.type === 'outbound-rtp' && report.kind === 'video') {
+        if ('framesPerSecond' in report) {
+          networkStats.framesPerSecond = report.framesPerSecond;
+        }
+        if ('framerateMean' in report) {
+          // framerateMean is only available in FF
+          networkStats.framesPerSecond = Math.round(report.framerateMean);
         }
       }
+      if (report.type === 'remote-inbound-rtp' && report.kind === 'audio') {
+        packetsLost += report.packetsLost;
+        networkStats.roundTripTime = report.roundTripTime;
+        networkStats.jitter = report.jitter;
+      }
+      if (report.type === 'remote-inbound-rtp' && report.kind === 'video') {
+        packetsLost += report.packetsLost;
+      }
+      if (report.type === 'transport') {
+        transportSent += report.bytesSent;
+        transportReceived += report.bytesReceived;
+      }
     });
+
+    networkStats.packetsLost = packetsLost;
+    networkStats.audioBytesSent = audioBytesSent;
+    networkStats.audioBytesReceived = audioBytesReceived;
+    networkStats.videoBytesSent = videoBytesSent;
+    networkStats.videoBytesReceived = videoBytesReceived;
+    networkStats.transportSent = transportSent;
+    networkStats.transportReceived = transportReceived;
+
+    const bandwidth = (networkStats.audioBytesSent - lastAudioSent) + (networkStats.videoBytesSent - lastVideoSent)
+      + (networkStats.audioBytesReceived - lastAudioReceived) + (networkStats.videoBytesReceived - lastVideoReceived)
+      + (networkStats.transportReceived - lastTransportReceived) + (networkStats.transportSent - lastTransportSent);
+
+    networkStats.bandwidth = bandwidth;
+
+    this.eventEmitter.emit(ON_NETWORK_STATS, session, networkStats, this.sessionNetworkStats[sessionId]);
+    this.sessionNetworkStats[sessionId].push(networkStats);
   }
 
 }