@wazo/sdk 0.37.16 → 0.37.20

package/lib/checker/checks/index.js

@@ -410,7 +410,7 @@ class IssueReporter {
           payload._retry = retry + 1;
         }
 
-        this._sendDebugToGrafana(body, retry + 1);
+        this._sendDebugToGrafana(payload, retry + 1);
       }, 5000 + retry * 1000);
     });
   }
@@ -2613,7 +2613,8 @@ class ExternalApp {
                              
                
                
-                
+                 
+                      
  
 
 class Meeting {
@@ -2625,6 +2626,7 @@ class Meeting {
                
                
                  
+                      
                             
 
   static parse(plain                         )          {
@@ -2636,6 +2638,7 @@ class Meeting {
       port: plain.port,
       uuid: plain.uuid,
       number: plain.number,
+      persistent: plain.persistent,
     });
   }
 
@@ -2643,7 +2646,7 @@ class Meeting {
     return newFrom(meeting, Meeting);
   }
 
-  constructor({ uuid, name, guestSipAuthorization, ownerUuids, port, uri, number }         = {}) {
+  constructor({ uuid, name, guestSipAuthorization, ownerUuids, port, uri, number, persistent }         = {}) {
     this.guestSipAuthorization = guestSipAuthorization;
     this.uri = uri;
     this.name = name;
@@ -2651,6 +2654,7 @@ class Meeting {
     this.port = port;
     this.uuid = uuid;
     this.number = number;
+    this.persistent = persistent;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'Meeting';
@@ -3240,7 +3244,7 @@ class Recording {
               
                
 
-  static parseMany(recordings                     )              {
+  static parseMany(recordings                      = [])              {
     return recordings.map(item => Recording.parse(item));
   }
 
@@ -3366,7 +3370,7 @@ class CallLog {
       duration: (plain.duration || 0) * 1000, // duration is in seconds
       start: moment__default['default'](plain.start).toDate(),
       end: plain.end ? moment__default['default'](plain.end).toDate() : null,
-      recordings: Recording.parseMany(plain.recordings),
+      recordings: Recording.parseMany(plain.recordings || []),
     });
   }
 
@@ -5881,6 +5885,7 @@ const ON_REINVITE = 'reinvite';
 const ON_ERROR = 'onError';
 const ON_SCREEN_SHARING_REINVITE = 'onScreenSharingReinvite';
 const ON_NETWORK_STATS = 'onNetworkStats';
+const ON_DISCONNECTED = 'onDisconnected';
 class CanceledCallError extends Error {}
 
 const MAX_REGISTER_TRIES = 10;
@@ -5954,6 +5959,7 @@ class WebRTCClient extends Emitter {
                    
                                      
                            
+                          
 
   static isAPrivateIp(ip        )          {
     const regex = /^(?:10|127|172\.(?:1[6-9]|2[0-9]|3[01])|192\.168)\..*/;
@@ -6019,6 +6025,7 @@ 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             ) {
@@ -6620,7 +6627,7 @@ 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 {
@@ -6866,10 +6873,13 @@ 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) {
@@ -6882,6 +6892,9 @@ 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);
         }
 
@@ -6906,7 +6919,7 @@ 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: {
@@ -6941,12 +6954,21 @@ 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
@@ -7630,6 +7652,7 @@ class WebRTCClient extends Emitter {
 
     this.updateRemoteStream(this.getSipSessionId(session));
 
+    const pc = session.sessionDescriptionHandler.peerConnection;
     const onTrack = (event     ) => {
       const isAudioOnly = this._isAudioOnly(session);
       const { kind, label, readyState, id, muted } = event.track;
@@ -7649,6 +7672,12 @@ 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);
     }
@@ -7860,25 +7889,33 @@ class WebRTCClient extends Emitter {
     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 === '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;
+        videoBytesSent += report.bytesSent + report.headerBytesSent;
       }
       if (report.type === 'inbound-rtp' && report.kind === 'audio') {
-        networkStats.packetsLost = report.packetsLost;
+        packetsLost += report.packetsLost;
         networkStats.packetsReceived = report.packetsReceived;
-        audioBytesReceived += report.bytesReceived;
+        audioBytesReceived += report.bytesReceived + report.headerBytesReceived;
       }
       if (report.type === 'inbound-rtp' && report.kind === 'video') {
-        videoBytesReceived += report.bytesReceived;
+        videoBytesReceived += report.bytesReceived + report.headerBytesReceived;
       }
       if (report.type === 'outbound-rtp' && report.kind === 'video') {
         if ('framesPerSecond' in report) {
@@ -7890,19 +7927,32 @@ class WebRTCClient extends Emitter {
         }
       }
       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 = (networkStats.audioBytesSent - lastAudioSent)
-      + (networkStats.videoBytesSent - lastVideoSent) + (networkStats.audioBytesReceived - lastAudioReceived)
-      + (networkStats.videoBytesReceived - lastVideoReceived);
+    networkStats.bandwidth = bandwidth;
 
     this.eventEmitter.emit(ON_NETWORK_STATS, session, networkStats, this.sessionNetworkStats[sessionId]);
     this.sessionNetworkStats[sessionId].push(networkStats);

package/lib/checker/checks/wazo-websocket.js

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

package/lib/checker/checks/webrtc-transport.js

@@ -673,7 +673,7 @@ class IssueReporter {
           payload._retry = retry + 1;
         }
 
-        this._sendDebugToGrafana(body, retry + 1);
+        this._sendDebugToGrafana(payload, retry + 1);
       }, 5000 + retry * 1000);
     });
   }
@@ -3175,7 +3175,8 @@ class ExternalApp {
                              
                
                
-                
+                 
+                      
  
 
 class Meeting {
@@ -3187,6 +3188,7 @@ class Meeting {
                
                
                  
+                      
                             
 
   static parse(plain                         )          {
@@ -3198,6 +3200,7 @@ class Meeting {
       port: plain.port,
       uuid: plain.uuid,
       number: plain.number,
+      persistent: plain.persistent,
     });
   }
 
@@ -3205,7 +3208,7 @@ class Meeting {
     return newFrom(meeting, Meeting);
   }
 
-  constructor({ uuid, name, guestSipAuthorization, ownerUuids, port, uri, number }         = {}) {
+  constructor({ uuid, name, guestSipAuthorization, ownerUuids, port, uri, number, persistent }         = {}) {
     this.guestSipAuthorization = guestSipAuthorization;
     this.uri = uri;
     this.name = name;
@@ -3213,6 +3216,7 @@ class Meeting {
     this.port = port;
     this.uuid = uuid;
     this.number = number;
+    this.persistent = persistent;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'Meeting';
@@ -3776,7 +3780,7 @@ class Recording {
               
                
 
-  static parseMany(recordings                     )              {
+  static parseMany(recordings                      = [])              {
     return recordings.map(item => Recording.parse(item));
   }
 
@@ -3902,7 +3906,7 @@ class CallLog {
       duration: (plain.duration || 0) * 1000, // duration is in seconds
       start: moment__default['default'](plain.start).toDate(),
       end: plain.end ? moment__default['default'](plain.end).toDate() : null,
-      recordings: Recording.parseMany(plain.recordings),
+      recordings: Recording.parseMany(plain.recordings || []),
     });
   }
 
@@ -5297,6 +5301,7 @@ const ON_REINVITE = 'reinvite';
 const ON_ERROR = 'onError';
 const ON_SCREEN_SHARING_REINVITE = 'onScreenSharingReinvite';
 const ON_NETWORK_STATS = 'onNetworkStats';
+const ON_DISCONNECTED = 'onDisconnected';
 class CanceledCallError extends Error {}
 
 const MAX_REGISTER_TRIES = 10;
@@ -5370,6 +5375,7 @@ class WebRTCClient extends Emitter {
                    
                                      
                            
+                          
 
   static isAPrivateIp(ip        )          {
     const regex = /^(?:10|127|172\.(?:1[6-9]|2[0-9]|3[01])|192\.168)\..*/;
@@ -5435,6 +5441,7 @@ 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             ) {
@@ -6036,7 +6043,7 @@ 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 {
@@ -6282,10 +6289,13 @@ 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) {
@@ -6298,6 +6308,9 @@ 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);
         }
 
@@ -6322,7 +6335,7 @@ 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: {
@@ -6357,12 +6370,21 @@ 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
@@ -7046,6 +7068,7 @@ class WebRTCClient extends Emitter {
 
     this.updateRemoteStream(this.getSipSessionId(session));
 
+    const pc = session.sessionDescriptionHandler.peerConnection;
     const onTrack = (event     ) => {
       const isAudioOnly = this._isAudioOnly(session);
       const { kind, label, readyState, id, muted } = event.track;
@@ -7065,6 +7088,12 @@ 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);
     }
@@ -7276,25 +7305,33 @@ class WebRTCClient extends Emitter {
     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 === '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;
+        videoBytesSent += report.bytesSent + report.headerBytesSent;
       }
       if (report.type === 'inbound-rtp' && report.kind === 'audio') {
-        networkStats.packetsLost = report.packetsLost;
+        packetsLost += report.packetsLost;
         networkStats.packetsReceived = report.packetsReceived;
-        audioBytesReceived += report.bytesReceived;
+        audioBytesReceived += report.bytesReceived + report.headerBytesReceived;
       }
       if (report.type === 'inbound-rtp' && report.kind === 'video') {
-        videoBytesReceived += report.bytesReceived;
+        videoBytesReceived += report.bytesReceived + report.headerBytesReceived;
       }
       if (report.type === 'outbound-rtp' && report.kind === 'video') {
         if ('framesPerSecond' in report) {
@@ -7306,19 +7343,32 @@ class WebRTCClient extends Emitter {
         }
       }
       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 = (networkStats.audioBytesSent - lastAudioSent)
-      + (networkStats.videoBytesSent - lastVideoSent) + (networkStats.audioBytesReceived - lastAudioReceived)
-      + (networkStats.videoBytesReceived - lastVideoReceived);
+    networkStats.bandwidth = bandwidth;
 
     this.eventEmitter.emit(ON_NETWORK_STATS, session, networkStats, this.sessionNetworkStats[sessionId]);
     this.sessionNetworkStats[sessionId].push(networkStats);