@wazo/sdk 0.37.17 → 0.37.21

package/esm/__tests__/api-client.test.js

@@ -130,6 +130,7 @@ class IssueReporter {
                             
                                 
                                   
+                       
 
   constructor() {
     addLevelsTo(this);
@@ -141,12 +142,17 @@ class IssueReporter {
     this.bufferTimeout = null;
     this._boundProcessBuffer = this._processBuffer.bind(this);
     this._boundParseLoggerBody = this._parseLoggerBody.bind(this);
+    this._callback = null;
   }
 
   init() {
     this._catchConsole();
   }
 
+  setCallback(cb          ) {
+    this._callback = cb;
+  }
+
   configureRemoteClient(configuration         = { tag: 'wazo-sdk', host: null, port: null, level: null, extra: {} }) {
     this.remoteClientConfiguration = configuration;
   }
@@ -182,6 +188,7 @@ class IssueReporter {
 
     // Handle category label
     let category = null;
+    let skipSendToRemote = false;
     let extra = {};
     if (args[0].indexOf(CATEGORY_PREFIX) === 0) {
       category = args[0].split('=')[1];
@@ -197,6 +204,7 @@ class IssueReporter {
           errorMessage: lastArg.message,
           errorStack: lastArg.stack,
           errorType: lastArg.constructor.name,
+          skipSendToRemote: lastArg.skipSendToRemote,
         };
       } else {
         extra = lastArg;
@@ -205,6 +213,11 @@ class IssueReporter {
       args.splice(1, 1);
     }
 
+    if (extra.skipSendToRemote) {
+      skipSendToRemote = true;
+      delete extra.skipSendToRemote;
+    }
+
     const date = moment().format('YYYY-MM-DD HH:mm:ss.SSS');
     const message = args.join(', ');
     let consoleMessage = message;
@@ -225,7 +238,13 @@ class IssueReporter {
     const oldMethod = this.oldConsoleMethods[consoleLevel] || this.oldConsoleMethods.log;
     oldMethod.apply(oldMethod, [date, consoleMessage]);
 
-    this._sendToRemoteLogger(level, { date, message, category, ...extra });
+    if (this._callback) {
+      this._callback(level, consoleMessage);
+    }
+
+    if (!skipSendToRemote) {
+      this._sendToRemoteLogger(level, { date, message, category, ...extra });
+    }
   }
 
   logRequest(url        , options        , response        , start      ) {
@@ -370,7 +389,11 @@ class IssueReporter {
       },
       // $FlowFixMe
       body,
-    }).catch(() => {
+    }).catch((e       ) => {
+      // $FlowFixMe
+      e.skipSendToRemote = true;
+      this.log('error', this._makeCategory('grafana'), 'Sending log to grafana, error', e);
+
       setTimeout(() => {
         if (isArray) {
           payload = payload.map(message => {
@@ -382,7 +405,7 @@ class IssueReporter {
           payload._retry = retry + 1;
         }
 
-        this._sendDebugToGrafana(body, retry + 1);
+        this._sendDebugToGrafana(payload, retry + 1);
       }, 5000 + retry * 1000);
     });
   }
@@ -2585,7 +2608,8 @@ class ExternalApp {
                              
                
                
-                
+                 
+                      
  
 
 class Meeting {
@@ -2597,6 +2621,7 @@ class Meeting {
                
                
                  
+                      
                             
 
   static parse(plain                         )          {
@@ -2608,14 +2633,28 @@ class Meeting {
       port: plain.port,
       uuid: plain.uuid,
       number: plain.number,
+      persistent: plain.persistent,
     });
   }
 
+  static parseMany(items                           )                 {
+    return items.map(plain => Meeting.parse(plain));
+  }
+
   static newFrom(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;
@@ -2623,6 +2662,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';
@@ -2700,8 +2740,11 @@ var confdMethods = (client              , baseUrl        ) => ({
     }
   },
 
-  createMyMeeting: (name        )                   =>
-    client.post(`${baseUrl}/users/me/meetings`, { name }).then(Meeting.parse),
+  getMyMeetings: ()                   =>
+    client.get(`${baseUrl}/users/me/meetings`).then(response => Meeting.parseMany(response.items)),
+
+  createMyMeeting: (name        , persistent         )                   =>
+    client.post(`${baseUrl}/users/me/meetings`, { name, persistent }).then(Meeting.parse),
 
   deleteMyMeeting: (meetingUuid        )                   =>
     client.delete(`${baseUrl}/users/me/meetings/${meetingUuid}`, null),
@@ -3186,7 +3229,7 @@ class Recording {
               
                
 
-  static parseMany(recordings                     )              {
+  static parseMany(recordings                      = [])              {
     return recordings.map(item => Recording.parse(item));
   }
 
@@ -3312,7 +3355,7 @@ class CallLog {
       duration: (plain.duration || 0) * 1000, // duration is in seconds
       start: moment(plain.start).toDate(),
       end: plain.end ? moment(plain.end).toDate() : null,
-      recordings: Recording.parseMany(plain.recordings),
+      recordings: Recording.parseMany(plain.recordings || []),
     });
   }
 

package/esm/__tests__/web-rtc-client.test.js

@@ -412,6 +412,7 @@ class IssueReporter {
                             
                                 
                                   
+                       
 
   constructor() {
     addLevelsTo(this);
@@ -423,12 +424,17 @@ class IssueReporter {
     this.bufferTimeout = null;
     this._boundProcessBuffer = this._processBuffer.bind(this);
     this._boundParseLoggerBody = this._parseLoggerBody.bind(this);
+    this._callback = null;
   }
 
   init() {
     this._catchConsole();
   }
 
+  setCallback(cb          ) {
+    this._callback = cb;
+  }
+
   configureRemoteClient(configuration         = { tag: 'wazo-sdk', host: null, port: null, level: null, extra: {} }) {
     this.remoteClientConfiguration = configuration;
   }
@@ -464,6 +470,7 @@ class IssueReporter {
 
     // Handle category label
     let category = null;
+    let skipSendToRemote = false;
     let extra = {};
     if (args[0].indexOf(CATEGORY_PREFIX) === 0) {
       category = args[0].split('=')[1];
@@ -479,6 +486,7 @@ class IssueReporter {
           errorMessage: lastArg.message,
           errorStack: lastArg.stack,
           errorType: lastArg.constructor.name,
+          skipSendToRemote: lastArg.skipSendToRemote,
         };
       } else {
         extra = lastArg;
@@ -487,6 +495,11 @@ class IssueReporter {
       args.splice(1, 1);
     }
 
+    if (extra.skipSendToRemote) {
+      skipSendToRemote = true;
+      delete extra.skipSendToRemote;
+    }
+
     const date = moment().format('YYYY-MM-DD HH:mm:ss.SSS');
     const message = args.join(', ');
     let consoleMessage = message;
@@ -507,7 +520,13 @@ class IssueReporter {
     const oldMethod = this.oldConsoleMethods[consoleLevel] || this.oldConsoleMethods.log;
     oldMethod.apply(oldMethod, [date, consoleMessage]);
 
-    this._sendToRemoteLogger(level, { date, message, category, ...extra });
+    if (this._callback) {
+      this._callback(level, consoleMessage);
+    }
+
+    if (!skipSendToRemote) {
+      this._sendToRemoteLogger(level, { date, message, category, ...extra });
+    }
   }
 
   logRequest(url        , options        , response        , start      ) {
@@ -652,7 +671,11 @@ class IssueReporter {
       },
       // $FlowFixMe
       body,
-    }).catch(() => {
+    }).catch((e       ) => {
+      // $FlowFixMe
+      e.skipSendToRemote = true;
+      this.log('error', this._makeCategory('grafana'), 'Sending log to grafana, error', e);
+
       setTimeout(() => {
         if (isArray) {
           payload = payload.map(message => {
@@ -664,7 +687,7 @@ class IssueReporter {
           payload._retry = retry + 1;
         }
 
-        this._sendDebugToGrafana(body, retry + 1);
+        this._sendDebugToGrafana(payload, retry + 1);
       }, 5000 + retry * 1000);
     });
   }
@@ -3166,7 +3189,8 @@ class ExternalApp {
                              
                
                
-                
+                 
+                      
  
 
 class Meeting {
@@ -3178,6 +3202,7 @@ class Meeting {
                
                
                  
+                      
                             
 
   static parse(plain                         )          {
@@ -3189,14 +3214,28 @@ class Meeting {
       port: plain.port,
       uuid: plain.uuid,
       number: plain.number,
+      persistent: plain.persistent,
     });
   }
 
+  static parseMany(items                           )                 {
+    return items.map(plain => Meeting.parse(plain));
+  }
+
   static newFrom(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;
@@ -3204,6 +3243,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';
@@ -3281,8 +3321,11 @@ var confdMethods = (client              , baseUrl        ) => ({
     }
   },
 
-  createMyMeeting: (name        )                   =>
-    client.post(`${baseUrl}/users/me/meetings`, { name }).then(Meeting.parse),
+  getMyMeetings: ()                   =>
+    client.get(`${baseUrl}/users/me/meetings`).then(response => Meeting.parseMany(response.items)),
+
+  createMyMeeting: (name        , persistent         )                   =>
+    client.post(`${baseUrl}/users/me/meetings`, { name, persistent }).then(Meeting.parse),
 
   deleteMyMeeting: (meetingUuid        )                   =>
     client.delete(`${baseUrl}/users/me/meetings/${meetingUuid}`, null),
@@ -3767,7 +3810,7 @@ class Recording {
               
                
 
-  static parseMany(recordings                     )              {
+  static parseMany(recordings                      = [])              {
     return recordings.map(item => Recording.parse(item));
   }
 
@@ -3893,7 +3936,7 @@ class CallLog {
       duration: (plain.duration || 0) * 1000, // duration is in seconds
       start: moment(plain.start).toDate(),
       end: plain.end ? moment(plain.end).toDate() : null,
-      recordings: Recording.parseMany(plain.recordings),
+      recordings: Recording.parseMany(plain.recordings || []),
     });
   }
 
@@ -5288,6 +5331,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;
@@ -5361,6 +5405,7 @@ class WebRTCClient extends Emitter {
                    
                                      
                            
+                          
 
   static isAPrivateIp(ip        )          {
     const regex = /^(?:10|127|172\.(?:1[6-9]|2[0-9]|3[01])|192\.168)\..*/;
@@ -5426,6 +5471,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             ) {
@@ -5691,7 +5737,9 @@ class WebRTCClient extends Emitter {
     const inviteOptions                       = {
       requestDelegate: {
         onAccept: (response                  ) => {
-          session.sessionDescriptionHandler.peerConnection.sfu = conference;
+          if (session.sessionDescriptionHandler.peerConnection) {
+            session.sessionDescriptionHandler.peerConnection.sfu = conference;
+          }
           this._onAccepted(session, response.session, true);
         },
         onReject: (response                  ) => {
@@ -6027,7 +6075,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 {
@@ -6563,6 +6611,16 @@ class WebRTCClient extends Emitter {
     return this.hasRemoteVideo(sessionId) ? this.getRemoteStream(sessionId) : null;
   }
 
+  //  Useful in a react-native environment when remoteMediaStream is not updated
+  getRemoteVideoStreamFromPc(sessionId        )               {
+    const pc = this.getPeerConnection(sessionId);
+    if (!pc) {
+      return null;
+    }
+
+    return pc.getRemoteStreams().find(stream => !!stream.getVideoTracks().length);
+  }
+
   hasVideo(sessionId        )          {
     return this.hasLocalVideo(sessionId) || this.hasRemoteVideo(sessionId);
   }
@@ -7052,6 +7110,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;
@@ -7071,6 +7130,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);
     }
@@ -7290,6 +7355,7 @@ class WebRTCClient extends Emitter {
     let videoBytesReceived = 0;
     let transportSent = 0;
     let transportReceived = 0;
+    let packetsLost = 0;
 
     stats.forEach(report => {
       if (report.type === 'outbound-rtp' && report.kind === 'audio') {
@@ -7302,7 +7368,7 @@ class WebRTCClient extends Emitter {
         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 + report.headerBytesReceived;
       }
@@ -7319,27 +7385,36 @@ 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.audioBytesSent = audioBytesSent;
+    networkStats.packetsLost = packetsLost;
+    networkStats.totalAudioBytesSent = audioBytesSent;
+    networkStats.audioBytesSent = audioBytesSent - lastAudioSent;
+    networkStats.totalAudioBytesReceived = audioBytesReceived - lastAudioReceived;
     networkStats.audioBytesReceived = audioBytesReceived;
-    networkStats.videoBytesSent = videoBytesSent;
-    networkStats.videoBytesReceived = videoBytesReceived;
+    networkStats.totalVideoBytesSent = videoBytesSent;
+    networkStats.videoBytesSent = videoBytesSent - lastVideoSent;
+    networkStats.totalVideoBytesReceived = videoBytesReceived;
+    networkStats.videoBytesReceived = videoBytesReceived - lastVideoReceived;
+    networkStats.totalTransportSent = transportSent - lastTransportSent;
     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.totalTransportReceived = transportReceived;
+    networkStats.transportReceived = transportReceived - lastTransportReceived;
 
-    networkStats.bandwidth = bandwidth;
+    networkStats.bandwidth = networkStats.audioBytesSent + networkStats.audioBytesReceived
+      + networkStats.videoBytesSent + networkStats.videoBytesReceived + networkStats.transportReceived
+      + networkStats.transportSent;
 
     this.eventEmitter.emit(ON_NETWORK_STATS, session, networkStats, this.sessionNetworkStats[sessionId]);
     this.sessionNetworkStats[sessionId].push(networkStats);

package/esm/api/agentd.js

@@ -126,6 +126,7 @@ class IssueReporter {
                             
                                 
                                   
+                       
 
   constructor() {
     addLevelsTo(this);
@@ -137,12 +138,17 @@ class IssueReporter {
     this.bufferTimeout = null;
     this._boundProcessBuffer = this._processBuffer.bind(this);
     this._boundParseLoggerBody = this._parseLoggerBody.bind(this);
+    this._callback = null;
   }
 
   init() {
     this._catchConsole();
   }
 
+  setCallback(cb          ) {
+    this._callback = cb;
+  }
+
   configureRemoteClient(configuration         = { tag: 'wazo-sdk', host: null, port: null, level: null, extra: {} }) {
     this.remoteClientConfiguration = configuration;
   }
@@ -178,6 +184,7 @@ class IssueReporter {
 
     // Handle category label
     let category = null;
+    let skipSendToRemote = false;
     let extra = {};
     if (args[0].indexOf(CATEGORY_PREFIX) === 0) {
       category = args[0].split('=')[1];
@@ -193,6 +200,7 @@ class IssueReporter {
           errorMessage: lastArg.message,
           errorStack: lastArg.stack,
           errorType: lastArg.constructor.name,
+          skipSendToRemote: lastArg.skipSendToRemote,
         };
       } else {
         extra = lastArg;
@@ -201,6 +209,11 @@ class IssueReporter {
       args.splice(1, 1);
     }
 
+    if (extra.skipSendToRemote) {
+      skipSendToRemote = true;
+      delete extra.skipSendToRemote;
+    }
+
     const date = moment().format('YYYY-MM-DD HH:mm:ss.SSS');
     const message = args.join(', ');
     let consoleMessage = message;
@@ -221,7 +234,13 @@ class IssueReporter {
     const oldMethod = this.oldConsoleMethods[consoleLevel] || this.oldConsoleMethods.log;
     oldMethod.apply(oldMethod, [date, consoleMessage]);
 
-    this._sendToRemoteLogger(level, { date, message, category, ...extra });
+    if (this._callback) {
+      this._callback(level, consoleMessage);
+    }
+
+    if (!skipSendToRemote) {
+      this._sendToRemoteLogger(level, { date, message, category, ...extra });
+    }
   }
 
   logRequest(url        , options        , response        , start      ) {
@@ -366,7 +385,11 @@ class IssueReporter {
       },
       // $FlowFixMe
       body,
-    }).catch(() => {
+    }).catch((e       ) => {
+      // $FlowFixMe
+      e.skipSendToRemote = true;
+      this.log('error', this._makeCategory('grafana'), 'Sending log to grafana, error', e);
+
       setTimeout(() => {
         if (isArray) {
           payload = payload.map(message => {
@@ -378,7 +401,7 @@ class IssueReporter {
           payload._retry = retry + 1;
         }
 
-        this._sendDebugToGrafana(body, retry + 1);
+        this._sendDebugToGrafana(payload, retry + 1);
       }, 5000 + retry * 1000);
     });
   }

package/esm/api/amid.js

@@ -65,6 +65,7 @@ class IssueReporter {
                             
                                 
                                   
+                       
 
   constructor() {
     addLevelsTo(this);
@@ -76,12 +77,17 @@ class IssueReporter {
     this.bufferTimeout = null;
     this._boundProcessBuffer = this._processBuffer.bind(this);
     this._boundParseLoggerBody = this._parseLoggerBody.bind(this);
+    this._callback = null;
   }
 
   init() {
     this._catchConsole();
   }
 
+  setCallback(cb          ) {
+    this._callback = cb;
+  }
+
   configureRemoteClient(configuration         = { tag: 'wazo-sdk', host: null, port: null, level: null, extra: {} }) {
     this.remoteClientConfiguration = configuration;
   }
@@ -117,6 +123,7 @@ class IssueReporter {
 
     // Handle category label
     let category = null;
+    let skipSendToRemote = false;
     let extra = {};
     if (args[0].indexOf(CATEGORY_PREFIX) === 0) {
       category = args[0].split('=')[1];
@@ -132,6 +139,7 @@ class IssueReporter {
           errorMessage: lastArg.message,
           errorStack: lastArg.stack,
           errorType: lastArg.constructor.name,
+          skipSendToRemote: lastArg.skipSendToRemote,
         };
       } else {
         extra = lastArg;
@@ -140,6 +148,11 @@ class IssueReporter {
       args.splice(1, 1);
     }
 
+    if (extra.skipSendToRemote) {
+      skipSendToRemote = true;
+      delete extra.skipSendToRemote;
+    }
+
     const date = moment().format('YYYY-MM-DD HH:mm:ss.SSS');
     const message = args.join(', ');
     let consoleMessage = message;
@@ -160,7 +173,13 @@ class IssueReporter {
     const oldMethod = this.oldConsoleMethods[consoleLevel] || this.oldConsoleMethods.log;
     oldMethod.apply(oldMethod, [date, consoleMessage]);
 
-    this._sendToRemoteLogger(level, { date, message, category, ...extra });
+    if (this._callback) {
+      this._callback(level, consoleMessage);
+    }
+
+    if (!skipSendToRemote) {
+      this._sendToRemoteLogger(level, { date, message, category, ...extra });
+    }
   }
 
   logRequest(url        , options        , response        , start      ) {
@@ -305,7 +324,11 @@ class IssueReporter {
       },
       // $FlowFixMe
       body,
-    }).catch(() => {
+    }).catch((e       ) => {
+      // $FlowFixMe
+      e.skipSendToRemote = true;
+      this.log('error', this._makeCategory('grafana'), 'Sending log to grafana, error', e);
+
       setTimeout(() => {
         if (isArray) {
           payload = payload.map(message => {
@@ -317,7 +340,7 @@ class IssueReporter {
           payload._retry = retry + 1;
         }
 
-        this._sendDebugToGrafana(body, retry + 1);
+        this._sendDebugToGrafana(payload, retry + 1);
       }, 5000 + retry * 1000);
     });
   }