@wazo/sdk 0.37.19 → 0.37.23

package/lib/simple/Phone.js

@@ -105,6 +105,9 @@ class Call {
                      
 
   static parseMany(plain                     )              {
+    if (!plain) {
+      return [];
+    }
     return plain.map((plainCall              ) => Call.parse(plainCall));
   }
 
@@ -721,6 +724,7 @@ class IssueReporter {
                             
                                 
                                   
+                       
 
   constructor() {
     addLevelsTo(this);
@@ -732,12 +736,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;
   }
@@ -773,6 +782,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];
@@ -788,6 +798,7 @@ class IssueReporter {
           errorMessage: lastArg.message,
           errorStack: lastArg.stack,
           errorType: lastArg.constructor.name,
+          skipSendToRemote: lastArg.skipSendToRemote,
         };
       } else {
         extra = lastArg;
@@ -796,6 +807,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;
@@ -816,7 +832,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      ) {
@@ -961,7 +983,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 => {
@@ -2088,6 +2114,9 @@ class Contact {
   }
 
   static parseMany(response                  )                 {
+    if (!response || !response.results) {
+      return [];
+    }
     return response.results.map(r => Contact.parse(r, response.column_types));
   }
 
@@ -3194,11 +3223,27 @@ class Meeting {
     });
   }
 
+  static parseMany(items                           )                 {
+    if (!items) {
+      return [];
+    }
+    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;
@@ -3284,8 +3329,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),
@@ -3381,6 +3429,10 @@ class ChatMessage {
                 
 
   static parseMany(plain                         )                     {
+    if (!plain || !plain.items) {
+      return [];
+    }
+
     return plain.items.map(item => ChatMessage.parse(item));
   }
 
@@ -3490,6 +3542,9 @@ class Voicemail {
   }
 
   static parseMany(plain          )                   {
+    if (!plain) {
+      return [];
+    }
     const plainUnread = plain.folders.filter(folder => folder.type === 'new')[0].messages;
     const plainRead = plain.folders.filter(folder => folder.type === 'old')[0].messages;
 
@@ -3591,6 +3646,9 @@ class Recording {
                
 
   static parseMany(recordings                      = [])              {
+    if (!recordings) {
+      return [];
+    }
     return recordings.map(item => Recording.parse(item));
   }
 
@@ -3692,6 +3750,10 @@ class CallLog {
   }
 
   static parseMany(plain          )                 {
+    if (!plain || !plain.items) {
+      return [];
+    }
+
     return plain.items.map(item => CallLog.parse(item));
   }
 
@@ -4261,6 +4323,10 @@ class CTIPhone extends Emitter                  {
     return false;
   }
 
+  hasAVideoTrack()          {
+    return false;
+  }
+
   getLocalStreamForCall()               {
     return null;
   }
@@ -4654,6 +4720,9 @@ class ChatRoom {
                          
 
   static parseMany(plain                  )                  {
+    if (!plain || !plain.items) {
+      return [];
+    }
     return plain.items.map(item => ChatRoom.parse(item));
   }
 
@@ -5635,10 +5704,6 @@ const getSrflxOrRelay = (candidates          )           =>
   candidates
     .filter(candidate => candidate && (candidate.type === 'srflx' || candidate.type === 'relay'));
 
-const areCandidateValid = (candidates          )          =>
-  getSrflxOrRelay(candidates)
-    .length > 0;
-
 const getVideoDirection = (sdp        )          => {
   const parsedSdp = sdpParser__default['default'].parse(sdp);
   const videoMedia = parsedSdp.media.find(media => media.type === 'video');
@@ -5691,8 +5756,6 @@ const fixSdp = (sdp        , candidates          , forcePort          = true)
 /* global RTCSessionDescriptionInit, navigator */
 
 const wazoLogger = IssueReporter$1 ? IssueReporter$1.loggerFor('webrtc-sdh') : console;
-const MAX_WAIT_FOR_ICE_TRIES = 20;
-const WAIT_FOR_ICE_TIMEOUT = 500;
 
 // Customized mediaStreamFactory allowing to send screensharing stream directory when upgrading
 const wazoMediaStreamFactory = (constraints        )                       => {
@@ -5882,38 +5945,6 @@ class WazoSessionDescriptionHandler extends sessionDescriptionHandler.SessionDes
     this._peerConnection = undefined;
   }
 
-  async _waitForValidGatheredIce()         {
-    let tries = 0;
-
-    while (!areCandidateValid(this.gatheredCandidates) && tries < MAX_WAIT_FOR_ICE_TRIES) {
-      wazoLogger.trace('SessionDescriptionHandler._waitForValidGatheredIce, waiting for ice', {
-        tries,
-        max: MAX_WAIT_FOR_ICE_TRIES,
-      });
-
-      tries++;
-
-      // eslint-disable-next-line no-await-in-loop
-      await new Promise(resolve => setTimeout(resolve, WAIT_FOR_ICE_TIMEOUT));
-    }
-
-    if (tries >= MAX_WAIT_FOR_ICE_TRIES) {
-      const errorMsg = 'No valid candidates found, can\'t answer the call';
-      const error = new Error(errorMsg);
-      wazoLogger.error(errorMsg, { tries, max: MAX_WAIT_FOR_ICE_TRIES });
-
-      // Emit an error, because sip.js catches the exception and switch to status Terminated.
-      this.eventEmitter.emit('error', error);
-
-      wazoLogger.error('No valid candidates found', { tries, candidates: JSON.stringify(this.gatheredCandidates) });
-    }
-
-    // eslint-disable-next-line
-    wazoLogger.trace('Found valid candidates', { tries, candidates: JSON.stringify(this.gatheredCandidates) });
-
-    return this.getLocalSessionDescription();
-  }
-
   // Overridden to send `inactive` in conference
   updateDirection(options                                   , isConference          = false,
     audioOnly          = false)                {
@@ -6706,7 +6737,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                  ) => {
@@ -7578,6 +7611,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);
   }
@@ -8088,6 +8131,7 @@ class WebRTCClient extends Emitter {
     session.sessionDescriptionHandler.remoteMediaStream.onaddtrack = onTrack;
 
     pc.oniceconnectionstatechange = () => {
+      logger$9.info('on ice connection state changed', { state: pc.iceConnectionState });
       if (pc.iceConnectionState === 'disconnected') {
         this.eventEmitter.emit(ON_DISCONNECTED$1);
       }
@@ -8316,25 +8360,25 @@ class WebRTCClient extends Emitter {
 
     stats.forEach(report => {
       if (report.type === 'outbound-rtp' && report.kind === 'audio') {
-        audioBytesSent += report.bytesSent + report.headerBytesSent;
+        audioBytesSent += Number(report.bytesSent) + Number(report.headerBytesSent);
       }
       if (report.type === 'remote-outbound-rtp' && report.kind === 'audio') {
-        audioBytesSent += report.bytesSent;
+        audioBytesSent += Number(report.bytesSent);
       }
       if (report.type === 'outbound-rtp' && report.kind === 'video') {
-        videoBytesSent += report.bytesSent + report.headerBytesSent;
+        videoBytesSent += Number(report.bytesSent) + Number(report.headerBytesSent);
       }
       if (report.type === 'inbound-rtp' && report.kind === 'audio') {
-        packetsLost += report.packetsLost;
-        networkStats.packetsReceived = report.packetsReceived;
-        audioBytesReceived += report.bytesReceived + report.headerBytesReceived;
+        packetsLost += Number(report.packetsLost);
+        networkStats.packetsReceived = Number(report.packetsReceived);
+        audioBytesReceived += Number(report.bytesReceived) + Number(report.headerBytesReceived);
       }
       if (report.type === 'inbound-rtp' && report.kind === 'video') {
-        videoBytesReceived += report.bytesReceived + report.headerBytesReceived;
+        videoBytesReceived += Number(report.bytesReceived) + Number(report.headerBytesReceived);
       }
       if (report.type === 'outbound-rtp' && report.kind === 'video') {
         if ('framesPerSecond' in report) {
-          networkStats.framesPerSecond = report.framesPerSecond;
+          networkStats.framesPerSecond = Number(report.framesPerSecond);
         }
         if ('framerateMean' in report) {
           // framerateMean is only available in FF
@@ -8342,32 +8386,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;
+        packetsLost += Number(report.packetsLost);
+        networkStats.roundTripTime = Number(report.roundTripTime);
+        networkStats.jitter = Number(report.jitter);
       }
       if (report.type === 'remote-inbound-rtp' && report.kind === 'video') {
-        packetsLost += report.packetsLost;
+        packetsLost += Number(report.packetsLost);
       }
       if (report.type === 'transport') {
-        transportSent += report.bytesSent;
-        transportReceived += report.bytesReceived;
+        transportSent += Number(report.bytesSent);
+        transportReceived += Number(report.bytesReceived);
       }
     });
 
     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);
@@ -8749,7 +8797,10 @@ class WebRTCPhone extends Emitter                  {
 
         onCancel(message);
         const elsewhere = message.data.indexOf('cause=26') !== -1 && message.data.indexOf('completed elsewhere') !== -1;
-        this.eventEmitter.emit(ON_CALL_CANCELED, this._createCallSession(sipSession), elsewhere);
+        const callSession = this._createCallSession(sipSession);
+        delete this.callSessions[callSession.getId()];
+
+        this.eventEmitter.emit(ON_CALL_CANCELED, callSession, elsewhere);
       };
     } else if (sipSession instanceof invitation.Invitation) {
       console.warn('sipSession._onCancel not found, please update the wazo SDK accordingly');
@@ -8778,9 +8829,11 @@ class WebRTCPhone extends Emitter                  {
         case sessionState.SessionState.Terminated: {
           logger$8.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);
         }
       }
     });
@@ -8928,18 +8981,20 @@ class WebRTCPhone extends Emitter                  {
       screenTrack,
     });
 
-    screenTrack.onended = () => {
-      logger$8.info('WebRTC phone - on screenshare ended', {
-        hadVideo,
-        id: this.getSipSessionId(sipSession),
-        screenTrack,
-      });
+    if (screenTrack) {
+      screenTrack.onended = () => {
+        logger$8.info('WebRTC phone - on screenshare ended', {
+          hadVideo,
+          id: this.getSipSessionId(sipSession),
+          screenTrack,
+        });
 
-      this.eventEmitter.emit(
-        ON_SHARE_SCREEN_ENDING,
-        this._createCallSession(sipSession, callSession),
-      );
-    };
+        this.eventEmitter.emit(
+          ON_SHARE_SCREEN_ENDING,
+          this._createCallSession(sipSession, callSession),
+        );
+      };
+    }
 
     this.currentScreenShare = {
       stream: screenStream,
@@ -9728,6 +9783,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;
   }
@@ -10429,6 +10488,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,
@@ -10779,6 +10839,7 @@ WebSocketClient.eventLists = [
   AGENT_UNPAUSED,
   CONFERENCE_ADHOC_PARTICIPANT_LEFT,
   CONFERENCE_ADHOC_DELETED,
+  MEETING_USER_PROGRESS,
 ];
 
 var WebSocketClient$1 = /*#__PURE__*/Object.freeze({
@@ -10849,6 +10910,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
 });
@@ -13568,6 +13630,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;
   }

package/lib/simple/Websocket.js

@@ -129,6 +129,7 @@ class IssueReporter {
                             
                                 
                                   
+                       
 
   constructor() {
     addLevelsTo(this);
@@ -140,12 +141,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;
   }
@@ -181,6 +187,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];
@@ -196,6 +203,7 @@ class IssueReporter {
           errorMessage: lastArg.message,
           errorStack: lastArg.stack,
           errorType: lastArg.constructor.name,
+          skipSendToRemote: lastArg.skipSendToRemote,
         };
       } else {
         extra = lastArg;
@@ -204,6 +212,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;
@@ -224,7 +237,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      ) {
@@ -369,7 +388,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 => {
@@ -586,6 +609,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,
@@ -936,6 +960,7 @@ WebSocketClient.eventLists = [
   AGENT_UNPAUSED,
   CONFERENCE_ADHOC_PARTICIPANT_LEFT,
   CONFERENCE_ADHOC_DELETED,
+  MEETING_USER_PROGRESS,
 ];
 
 var WebSocketClient$1 = /*#__PURE__*/Object.freeze({
@@ -1006,6 +1031,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
 });