@wazo/sdk 0.37.15 → 0.37.19

package/lib/simple/Directory.js

@@ -388,7 +388,7 @@ class IssueReporter {
           payload._retry = retry + 1;
         }
 
-        this._sendDebugToGrafana(body, retry + 1);
+        this._sendDebugToGrafana(payload, retry + 1);
       }, 5000 + retry * 1000);
     });
   }
@@ -2591,7 +2591,8 @@ class ExternalApp {
                              
                
                
-                
+                 
+                      
  
 
 class Meeting {
@@ -2603,6 +2604,7 @@ class Meeting {
                
                
                  
+                      
                             
 
   static parse(plain                         )          {
@@ -2614,6 +2616,7 @@ class Meeting {
       port: plain.port,
       uuid: plain.uuid,
       number: plain.number,
+      persistent: plain.persistent,
     });
   }
 
@@ -2621,7 +2624,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;
@@ -2629,6 +2632,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';
@@ -3192,7 +3196,7 @@ class Recording {
               
                
 
-  static parseMany(recordings                     )              {
+  static parseMany(recordings                      = [])              {
     return recordings.map(item => Recording.parse(item));
   }
 
@@ -3318,7 +3322,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 || []),
     });
   }
 

package/lib/simple/Phone.js

@@ -973,7 +973,7 @@ class IssueReporter {
           payload._retry = retry + 1;
         }
 
-        this._sendDebugToGrafana(body, retry + 1);
+        this._sendDebugToGrafana(payload, retry + 1);
       }, 5000 + retry * 1000);
     });
   }
@@ -3165,7 +3165,8 @@ class ExternalApp {
                              
                
                
-                
+                 
+                      
  
 
 class Meeting {
@@ -3177,6 +3178,7 @@ class Meeting {
                
                
                  
+                      
                             
 
   static parse(plain                         )          {
@@ -3188,6 +3190,7 @@ class Meeting {
       port: plain.port,
       uuid: plain.uuid,
       number: plain.number,
+      persistent: plain.persistent,
     });
   }
 
@@ -3195,7 +3198,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;
@@ -3203,6 +3206,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';
@@ -3586,7 +3590,7 @@ class Recording {
               
                
 
-  static parseMany(recordings                     )              {
+  static parseMany(recordings                      = [])              {
     return recordings.map(item => Recording.parse(item));
   }
 
@@ -3712,7 +3716,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 || []),
     });
   }
 
@@ -6293,6 +6297,7 @@ const ON_REINVITE$1 = 'reinvite';
 const ON_ERROR = 'onError';
 const ON_SCREEN_SHARING_REINVITE = 'onScreenSharingReinvite';
 const ON_NETWORK_STATS$1 = 'onNetworkStats';
+const ON_DISCONNECTED$1 = 'onDisconnected';
 
 const events$1 = [REGISTERED, UNREGISTERED, REGISTRATION_FAILED, INVITE];
 const transportEvents = [CONNECTED, DISCONNECTED, TRANSPORT_ERROR, MESSAGE];
@@ -6369,6 +6374,7 @@ class WebRTCClient extends Emitter {
                    
                                      
                            
+                          
 
   static isAPrivateIp(ip        )          {
     const regex = /^(?:10|127|172\.(?:1[6-9]|2[0-9]|3[01])|192\.168)\..*/;
@@ -6434,6 +6440,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$1;
+    this.ON_DISCONNECTED = ON_DISCONNECTED$1;
   }
 
   configureMedia(media             ) {
@@ -7035,7 +7042,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 {
@@ -7281,10 +7288,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) {
@@ -7297,6 +7307,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);
         }
 
@@ -7321,7 +7334,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: {
@@ -7356,12 +7369,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
@@ -8045,6 +8067,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;
@@ -8064,6 +8087,12 @@ class WebRTCClient extends Emitter {
 
     session.sessionDescriptionHandler.remoteMediaStream.onaddtrack = onTrack;
 
+    pc.oniceconnectionstatechange = () => {
+      if (pc.iceConnectionState === 'disconnected') {
+        this.eventEmitter.emit(ON_DISCONNECTED$1);
+      }
+    };
+
     if (withEvent) {
       this.eventEmitter.emit(ACCEPTED, session, sessionDialog);
     }
@@ -8259,24 +8288,89 @@ 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;
     }
 
-    stats.forEach(report => {
-      if (report.type === 'inbound-rtp') {
-        if (report.kind === 'audio') {
-          const networkStats = {
-            packetsLost: report.packetsLost,
-            packetsReceived: report.packetsReceived,
-            jitter: report.jitter,
-          };
+    const networkStats         = {
+      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;
 
-          this.eventEmitter.emit(ON_NETWORK_STATS$1, session, networkStats, this.sessionNetworkStats[sessionId]);
-          this.sessionNetworkStats[sessionId].push(networkStats);
+    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 + 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$1, session, networkStats, this.sessionNetworkStats[sessionId]);
+    this.sessionNetworkStats[sessionId].push(networkStats);
   }
 
 }
@@ -8322,6 +8416,7 @@ const ON_MESSAGE_TRACK_UPDATED = 'onTrackUpdated';
 const ON_NETWORK_STATS = 'onNetworkStats';
 const ON_CHAT = 'phone/ON_CHAT';
 const ON_SIGNAL = 'phone/ON_SIGNAL';
+const ON_DISCONNECTED = 'onDisconnected';
 
 const MESSAGE_TYPE_CHAT = 'message/TYPE_CHAT';
 const MESSAGE_TYPE_SIGNAL = 'message/TYPE_SIGNAL';
@@ -8361,6 +8456,7 @@ const events = [
   ON_CHAT,
   ON_SIGNAL,
   ON_NETWORK_STATS,
+  ON_DISCONNECTED,
 ];
 
 const logger$8 = IssueReporter$1.loggerFor('webrtc-phone');
@@ -9713,6 +9809,11 @@ class WebRTCPhone extends Emitter                  {
       this.eventEmitter.emit(ON_UNREGISTERED);
     });
 
+    this.client.on(this.client.ON_DISCONNECTED, () => {
+      logger$8.info('WebRTC disconnected');
+      this.eventEmitter.emit(ON_DISCONNECTED);
+    });
+
     this.client.on(this.client.REGISTERED, () => {
       logger$8.info('WebRTC registered', {
         shouldSendReinvite: this.shouldSendReinvite,
@@ -9969,6 +10070,7 @@ var PHONE_EVENTS = /*#__PURE__*/Object.freeze({
   ON_NETWORK_STATS: ON_NETWORK_STATS,
   ON_CHAT: ON_CHAT,
   ON_SIGNAL: ON_SIGNAL,
+  ON_DISCONNECTED: ON_DISCONNECTED,
   MESSAGE_TYPE_CHAT: MESSAGE_TYPE_CHAT,
   MESSAGE_TYPE_SIGNAL: MESSAGE_TYPE_SIGNAL,
   events: events,

package/lib/simple/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);
     });
   }