@wazo/sdk 0.37.20 → 0.37.21

package/lib/simple/room/Participant.js

@@ -450,6 +450,7 @@ class IssueReporter {
                             
                                 
                                   
+                       
 
   constructor() {
     addLevelsTo(this);
@@ -461,12 +462,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;
   }
@@ -502,6 +508,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];
@@ -517,6 +524,7 @@ class IssueReporter {
           errorMessage: lastArg.message,
           errorStack: lastArg.stack,
           errorType: lastArg.constructor.name,
+          skipSendToRemote: lastArg.skipSendToRemote,
         };
       } else {
         extra = lastArg;
@@ -525,6 +533,11 @@ class IssueReporter {
       args.splice(1, 1);
     }
 
+    if (extra.skipSendToRemote) {
+      skipSendToRemote = true;
+      delete extra.skipSendToRemote;
+    }
+
     const date = moment__default['default']().format('YYYY-MM-DD HH:mm:ss.SSS');
     const message = args.join(', ');
     let consoleMessage = message;
@@ -545,7 +558,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      ) {
@@ -690,7 +709,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 => {
@@ -2669,11 +2692,24 @@ class Meeting {
     });
   }
 
+  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, persistent }         = {}) {
+  constructor({
+    uuid,
+    name,
+    guestSipAuthorization,
+    ownerUuids,
+    port,
+    uri,
+    number,
+    persistent,
+  }         = {}) {
     this.guestSipAuthorization = guestSipAuthorization;
     this.uri = uri;
     this.name = name;
@@ -2759,8 +2795,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),
@@ -6970,7 +7009,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                  ) => {
@@ -7842,6 +7883,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);
   }
@@ -8620,18 +8671,22 @@ class WebRTCClient extends Emitter {
     });
 
     networkStats.packetsLost = packetsLost;
-    networkStats.audioBytesSent = audioBytesSent;
+    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;
+    networkStats.totalTransportReceived = transportReceived;
+    networkStats.transportReceived = transportReceived - lastTransportReceived;
 
-    const bandwidth = (networkStats.audioBytesSent - lastAudioSent) + (networkStats.videoBytesSent - lastVideoSent)
-      + (networkStats.audioBytesReceived - lastAudioReceived) + (networkStats.videoBytesReceived - lastVideoReceived)
-      + (networkStats.transportReceived - lastTransportReceived) + (networkStats.transportSent - lastTransportSent);
-
-    networkStats.bandwidth = bandwidth;
+    networkStats.bandwidth = networkStats.audioBytesSent + networkStats.audioBytesReceived
+      + networkStats.videoBytesSent + networkStats.videoBytesReceived + networkStats.transportReceived
+      + networkStats.transportSent;
 
     this.eventEmitter.emit(ON_NETWORK_STATS$1, session, networkStats, this.sessionNetworkStats[sessionId]);
     this.sessionNetworkStats[sessionId].push(networkStats);
@@ -9042,9 +9097,11 @@ class WebRTCPhone extends Emitter                  {
         case sessionState.SessionState.Terminated: {
           logger$7.info('WebRTC phone - call terminated', { sipId: sipSession.id });
 
+          // Should be called before `_onCallTerminated` or the callCount will not decrement...
+          const callSession = this._createCallSession(sipSession);
           const wasCurrentSession = this._onCallTerminated(sipSession);
 
-          return this.eventEmitter.emit(ON_CALL_ENDED, this._createCallSession(sipSession), wasCurrentSession);
+          return this.eventEmitter.emit(ON_CALL_ENDED, callSession, wasCurrentSession);
         }
       }
     });
@@ -9992,6 +10049,10 @@ class WebRTCPhone extends Emitter                  {
     return callSession ? this.client.getRemoteVideoStream(callSession.sipCallId) : null;
   }
 
+  getRemoteVideoStreamFromPc(callSession             )               {
+    return callSession ? this.client.getRemoteVideoStreamFromPc(callSession.sipCallId) : null;
+  }
+
   hasRemoteVideo(callSession             )          {
     return callSession ? this.client.hasRemoteVideo(callSession.sipCallId) : false;
   }
@@ -10675,6 +10736,11 @@ class Phone extends Emitter {
     return this.getRemoteVideoStream(callSession);
   }
 
+  //  Useful in a react-native environment when remoteMediaStream is not updated
+  getRemoteVideoStreamFromPc(callSession             ) {
+    return this.phone ? this.phone.getRemoteVideoStreamFromPc(callSession) : false;
+  }
+
   hasVideo(callSession             )          {
     return this.phone ? this.phone.hasVideo(callSession) : false;
   }
@@ -10834,6 +10900,7 @@ const AGENT_PAUSED = 'agent_paused';
 const AGENT_UNPAUSED = 'agent_unpaused';
 const CONFERENCE_ADHOC_PARTICIPANT_LEFT = 'conference_adhoc_participant_left';
 const CONFERENCE_ADHOC_DELETED = 'conference_adhoc_deleted';
+const MEETING_USER_PROGRESS = 'meeting_user_progress';
 
 const BLACKLIST_EVENTS = [
   CHAT_MESSAGE_SENT,
@@ -11184,6 +11251,7 @@ WebSocketClient.eventLists = [
   AGENT_UNPAUSED,
   CONFERENCE_ADHOC_PARTICIPANT_LEFT,
   CONFERENCE_ADHOC_DELETED,
+  MEETING_USER_PROGRESS,
 ];
 
 var WebSocketClient$1 = /*#__PURE__*/Object.freeze({
@@ -11254,6 +11322,7 @@ var WebSocketClient$1 = /*#__PURE__*/Object.freeze({
   AGENT_UNPAUSED: AGENT_UNPAUSED,
   CONFERENCE_ADHOC_PARTICIPANT_LEFT: CONFERENCE_ADHOC_PARTICIPANT_LEFT,
   CONFERENCE_ADHOC_DELETED: CONFERENCE_ADHOC_DELETED,
+  MEETING_USER_PROGRESS: MEETING_USER_PROGRESS,
   HEARTBEAT_ENGINE_VERSION: HEARTBEAT_ENGINE_VERSION,
   'default': WebSocketClient
 });

package/lib/simple/room/RemoteParticipant.js

@@ -159,6 +159,7 @@ class IssueReporter {
                             
                                 
                                   
+                       
 
   constructor() {
     addLevelsTo(this);
@@ -170,12 +171,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;
   }
@@ -211,6 +217,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];
@@ -226,6 +233,7 @@ class IssueReporter {
           errorMessage: lastArg.message,
           errorStack: lastArg.stack,
           errorType: lastArg.constructor.name,
+          skipSendToRemote: lastArg.skipSendToRemote,
         };
       } else {
         extra = lastArg;
@@ -234,6 +242,11 @@ class IssueReporter {
       args.splice(1, 1);
     }
 
+    if (extra.skipSendToRemote) {
+      skipSendToRemote = true;
+      delete extra.skipSendToRemote;
+    }
+
     const date = moment__default['default']().format('YYYY-MM-DD HH:mm:ss.SSS');
     const message = args.join(', ');
     let consoleMessage = message;
@@ -254,7 +267,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      ) {
@@ -399,7 +418,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 => {
@@ -2643,11 +2666,24 @@ class Meeting {
     });
   }
 
+  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, persistent }         = {}) {
+  constructor({
+    uuid,
+    name,
+    guestSipAuthorization,
+    ownerUuids,
+    port,
+    uri,
+    number,
+    persistent,
+  }         = {}) {
     this.guestSipAuthorization = guestSipAuthorization;
     this.uri = uri;
     this.name = name;
@@ -2733,8 +2769,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),
@@ -6970,7 +7009,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                  ) => {
@@ -7842,6 +7883,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);
   }
@@ -8620,18 +8671,22 @@ class WebRTCClient extends Emitter {
     });
 
     networkStats.packetsLost = packetsLost;
-    networkStats.audioBytesSent = audioBytesSent;
+    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;
+    networkStats.totalTransportReceived = transportReceived;
+    networkStats.transportReceived = transportReceived - lastTransportReceived;
 
-    const bandwidth = (networkStats.audioBytesSent - lastAudioSent) + (networkStats.videoBytesSent - lastVideoSent)
-      + (networkStats.audioBytesReceived - lastAudioReceived) + (networkStats.videoBytesReceived - lastVideoReceived)
-      + (networkStats.transportReceived - lastTransportReceived) + (networkStats.transportSent - lastTransportSent);
-
-    networkStats.bandwidth = bandwidth;
+    networkStats.bandwidth = networkStats.audioBytesSent + networkStats.audioBytesReceived
+      + networkStats.videoBytesSent + networkStats.videoBytesReceived + networkStats.transportReceived
+      + networkStats.transportSent;
 
     this.eventEmitter.emit(ON_NETWORK_STATS$1, session, networkStats, this.sessionNetworkStats[sessionId]);
     this.sessionNetworkStats[sessionId].push(networkStats);
@@ -9042,9 +9097,11 @@ class WebRTCPhone extends Emitter                  {
         case sessionState.SessionState.Terminated: {
           logger$7.info('WebRTC phone - call terminated', { sipId: sipSession.id });
 
+          // Should be called before `_onCallTerminated` or the callCount will not decrement...
+          const callSession = this._createCallSession(sipSession);
           const wasCurrentSession = this._onCallTerminated(sipSession);
 
-          return this.eventEmitter.emit(ON_CALL_ENDED, this._createCallSession(sipSession), wasCurrentSession);
+          return this.eventEmitter.emit(ON_CALL_ENDED, callSession, wasCurrentSession);
         }
       }
     });
@@ -9992,6 +10049,10 @@ class WebRTCPhone extends Emitter                  {
     return callSession ? this.client.getRemoteVideoStream(callSession.sipCallId) : null;
   }
 
+  getRemoteVideoStreamFromPc(callSession             )               {
+    return callSession ? this.client.getRemoteVideoStreamFromPc(callSession.sipCallId) : null;
+  }
+
   hasRemoteVideo(callSession             )          {
     return callSession ? this.client.hasRemoteVideo(callSession.sipCallId) : false;
   }
@@ -10675,6 +10736,11 @@ class Phone extends Emitter {
     return this.getRemoteVideoStream(callSession);
   }
 
+  //  Useful in a react-native environment when remoteMediaStream is not updated
+  getRemoteVideoStreamFromPc(callSession             ) {
+    return this.phone ? this.phone.getRemoteVideoStreamFromPc(callSession) : false;
+  }
+
   hasVideo(callSession             )          {
     return this.phone ? this.phone.hasVideo(callSession) : false;
   }
@@ -10834,6 +10900,7 @@ const AGENT_PAUSED = 'agent_paused';
 const AGENT_UNPAUSED = 'agent_unpaused';
 const CONFERENCE_ADHOC_PARTICIPANT_LEFT = 'conference_adhoc_participant_left';
 const CONFERENCE_ADHOC_DELETED = 'conference_adhoc_deleted';
+const MEETING_USER_PROGRESS = 'meeting_user_progress';
 
 const BLACKLIST_EVENTS = [
   CHAT_MESSAGE_SENT,
@@ -11184,6 +11251,7 @@ WebSocketClient.eventLists = [
   AGENT_UNPAUSED,
   CONFERENCE_ADHOC_PARTICIPANT_LEFT,
   CONFERENCE_ADHOC_DELETED,
+  MEETING_USER_PROGRESS,
 ];
 
 var WebSocketClient$1 = /*#__PURE__*/Object.freeze({
@@ -11254,6 +11322,7 @@ var WebSocketClient$1 = /*#__PURE__*/Object.freeze({
   AGENT_UNPAUSED: AGENT_UNPAUSED,
   CONFERENCE_ADHOC_PARTICIPANT_LEFT: CONFERENCE_ADHOC_PARTICIPANT_LEFT,
   CONFERENCE_ADHOC_DELETED: CONFERENCE_ADHOC_DELETED,
+  MEETING_USER_PROGRESS: MEETING_USER_PROGRESS,
   HEARTBEAT_ENGINE_VERSION: HEARTBEAT_ENGINE_VERSION,
   'default': WebSocketClient
 });