@wazo/sdk 0.37.18 → 0.37.22

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

@@ -136,6 +136,7 @@ class IssueReporter {
                             
                                 
                                   
+                       
 
   constructor() {
     addLevelsTo(this);
@@ -147,12 +148,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;
   }
@@ -188,6 +194,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];
@@ -203,6 +210,7 @@ class IssueReporter {
           errorMessage: lastArg.message,
           errorStack: lastArg.stack,
           errorType: lastArg.constructor.name,
+          skipSendToRemote: lastArg.skipSendToRemote,
         };
       } else {
         extra = lastArg;
@@ -211,7 +219,12 @@ class IssueReporter {
       args.splice(1, 1);
     }
 
-    const date = moment__default["default"]().format('YYYY-MM-DD HH:mm:ss.SSS');
+    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;
 
@@ -231,7 +244,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      ) {
@@ -376,7 +395,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 => {
@@ -388,7 +411,7 @@ class IssueReporter {
           payload._retry = retry + 1;
         }
 
-        this._sendDebugToGrafana(body, retry + 1);
+        this._sendDebugToGrafana(payload, retry + 1);
       }, 5000 + retry * 1000);
     });
   }
@@ -2591,7 +2614,8 @@ class ExternalApp {
                              
                
                
-                
+                 
+                      
  
 
 class Meeting {
@@ -2603,6 +2627,7 @@ class Meeting {
                
                
                  
+                      
                             
 
   static parse(plain                         )          {
@@ -2614,14 +2639,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;
@@ -2629,6 +2668,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';
@@ -2706,8 +2746,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),
@@ -2809,7 +2852,7 @@ class ChatMessage {
   static parse(plain                     )              {
     return new ChatMessage({
       uuid: plain.uuid,
-      date: moment__default["default"](plain.created_at).toDate(),
+      date: moment__default['default'](plain.created_at).toDate(),
       content: plain.content,
       alias: plain.alias,
       userUuid: plain.user_uuid,
@@ -2901,7 +2944,7 @@ class Voicemail {
   static parse(plain                 )            {
     return new Voicemail({
       id: plain.id,
-      date: moment__default["default"](plain.timestamp * 1000).toDate(),
+      date: moment__default['default'](plain.timestamp * 1000).toDate(),
       duration: plain.duration * 1000,
       caller: {
         name: plain.caller_id_name,
@@ -3038,7 +3081,7 @@ class Call {
       onHold: plain.on_hold,
       status: plain.status,
       lineId: plain.line_id,
-      startingTime: moment__default["default"](plain.creation_time).toDate(),
+      startingTime: moment__default['default'](plain.creation_time).toDate(),
       talkingToIds: Object.keys(plain.talking_to || {}),
       recording: plain.record_state === RECORD_STATE_ACTIVE,
     });
@@ -3192,7 +3235,7 @@ class Recording {
               
                
 
-  static parseMany(recordings                     )              {
+  static parseMany(recordings                      = [])              {
     return recordings.map(item => Recording.parse(item));
   }
 
@@ -3200,8 +3243,8 @@ class Recording {
     return new Recording({
       deleted: plain.deleted,
       fileName: plain.filename,
-      end: plain.end_time ? moment__default["default"](plain.end_time).toDate() : null,
-      start: moment__default["default"](plain.start_time).toDate(),
+      end: plain.end_time ? moment__default['default'](plain.end_time).toDate() : null,
+      start: moment__default['default'](plain.start_time).toDate(),
       uuid: plain.uuid,
     });
   }
@@ -3299,7 +3342,7 @@ class CallLog {
 
   static parse(plain                 )          {
     return new CallLog({
-      answer: plain.answer ? moment__default["default"](plain.answer).toDate() : null,
+      answer: plain.answer ? moment__default['default'](plain.answer).toDate() : null,
       answered: plain.answered,
       callDirection: plain.call_direction,
       destination: {
@@ -3316,9 +3359,9 @@ class CallLog {
       },
       id: plain.id,
       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),
+      start: moment__default['default'](plain.start).toDate(),
+      end: plain.end ? moment__default['default'](plain.end).toDate() : null,
+      recordings: Recording.parseMany(plain.recordings || []),
     });
   }
 

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

@@ -421,6 +421,7 @@ class IssueReporter {
                             
                                 
                                   
+                       
 
   constructor() {
     addLevelsTo(this);
@@ -432,12 +433,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;
   }
@@ -473,6 +479,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];
@@ -488,6 +495,7 @@ class IssueReporter {
           errorMessage: lastArg.message,
           errorStack: lastArg.stack,
           errorType: lastArg.constructor.name,
+          skipSendToRemote: lastArg.skipSendToRemote,
         };
       } else {
         extra = lastArg;
@@ -496,7 +504,12 @@ class IssueReporter {
       args.splice(1, 1);
     }
 
-    const date = moment__default["default"]().format('YYYY-MM-DD HH:mm:ss.SSS');
+    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;
 
@@ -516,7 +529,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      ) {
@@ -661,7 +680,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 => {
@@ -673,7 +696,7 @@ class IssueReporter {
           payload._retry = retry + 1;
         }
 
-        this._sendDebugToGrafana(body, retry + 1);
+        this._sendDebugToGrafana(payload, retry + 1);
       }, 5000 + retry * 1000);
     });
   }
@@ -701,7 +724,7 @@ const parseCandidate = (candidate         )          => {
   if (!candidate) {
     return null;
   }
-  const result = sdpParser__default["default"].parse(candidate.indexOf('a=') === 0 ? candidate : `a=${candidate}`);
+  const result = sdpParser__default['default'].parse(candidate.indexOf('a=') === 0 ? candidate : `a=${candidate}`);
 
   return result.candidates ? result.candidates[0] : null;
 };
@@ -715,7 +738,7 @@ const areCandidateValid = (candidates          )          =>
     .length > 0;
 
 const getVideoDirection = (sdp        )          => {
-  const parsedSdp = sdpParser__default["default"].parse(sdp);
+  const parsedSdp = sdpParser__default['default'].parse(sdp);
   const videoMedia = parsedSdp.media.find(media => media.type === 'video');
   if (!videoMedia) {
     return null;
@@ -729,14 +752,14 @@ const hasAnActiveVideo = (sdp         )          => {
     return false;
   }
 
-  const parsedSdp = sdpParser__default["default"].parse(sdp);
+  const parsedSdp = sdpParser__default['default'].parse(sdp);
 
   return !!parsedSdp.media.find(media =>
     media.type === 'video' && media.port > 10 && (!media.direction || media.direction !== 'inactive'));
 };
 
 const fixSdp = (sdp        , candidates          , forcePort          = true)         => {
-  const parsedSdp = sdpParser__default["default"].parse(sdp);
+  const parsedSdp = sdpParser__default['default'].parse(sdp);
   const mainCandidate = getSrflxOrRelay(candidates)[0];
   const ip = mainCandidate ? mainCandidate.ip : null;
 
@@ -754,7 +777,7 @@ const fixSdp = (sdp        , candidates          , forcePort          = true)
     };
   });
 
-  let fixed = sdpParser__default["default"].write(parsedSdp);
+  let fixed = sdpParser__default['default'].write(parsedSdp);
 
   if (ip) {
     fixed = fixed.replace(/IN IP4 0.0.0.0/g, `IN IP4 ${ip}`);
@@ -800,7 +823,7 @@ class WazoSessionDescriptionHandler extends sessionDescriptionHandler.SessionDes
   ) {
     super(logger, mediaStreamFactory, sessionDescriptionHandlerConfiguration);
 
-    this.eventEmitter = new EventEmitter__default["default"]();
+    this.eventEmitter = new EventEmitter__default['default']();
     this.isWeb = isWeb;
     this.session = session;
   }
@@ -1239,7 +1262,7 @@ class Emitter {
                              
 
   constructor() {
-    this.eventEmitter = new EventEmitter__default["default"]();
+    this.eventEmitter = new EventEmitter__default['default']();
   }
 
   on(event        , callback          ) {
@@ -3175,7 +3198,8 @@ class ExternalApp {
                              
                
                
-                
+                 
+                      
  
 
 class Meeting {
@@ -3187,6 +3211,7 @@ class Meeting {
                
                
                  
+                      
                             
 
   static parse(plain                         )          {
@@ -3198,14 +3223,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;
@@ -3213,6 +3252,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';
@@ -3290,8 +3330,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),
@@ -3393,7 +3436,7 @@ class ChatMessage {
   static parse(plain                     )              {
     return new ChatMessage({
       uuid: plain.uuid,
-      date: moment__default["default"](plain.created_at).toDate(),
+      date: moment__default['default'](plain.created_at).toDate(),
       content: plain.content,
       alias: plain.alias,
       userUuid: plain.user_uuid,
@@ -3485,7 +3528,7 @@ class Voicemail {
   static parse(plain                 )            {
     return new Voicemail({
       id: plain.id,
-      date: moment__default["default"](plain.timestamp * 1000).toDate(),
+      date: moment__default['default'](plain.timestamp * 1000).toDate(),
       duration: plain.duration * 1000,
       caller: {
         name: plain.caller_id_name,
@@ -3622,7 +3665,7 @@ class Call {
       onHold: plain.on_hold,
       status: plain.status,
       lineId: plain.line_id,
-      startingTime: moment__default["default"](plain.creation_time).toDate(),
+      startingTime: moment__default['default'](plain.creation_time).toDate(),
       talkingToIds: Object.keys(plain.talking_to || {}),
       recording: plain.record_state === RECORD_STATE_ACTIVE,
     });
@@ -3776,7 +3819,7 @@ class Recording {
               
                
 
-  static parseMany(recordings                     )              {
+  static parseMany(recordings                      = [])              {
     return recordings.map(item => Recording.parse(item));
   }
 
@@ -3784,8 +3827,8 @@ class Recording {
     return new Recording({
       deleted: plain.deleted,
       fileName: plain.filename,
-      end: plain.end_time ? moment__default["default"](plain.end_time).toDate() : null,
-      start: moment__default["default"](plain.start_time).toDate(),
+      end: plain.end_time ? moment__default['default'](plain.end_time).toDate() : null,
+      start: moment__default['default'](plain.start_time).toDate(),
       uuid: plain.uuid,
     });
   }
@@ -3883,7 +3926,7 @@ class CallLog {
 
   static parse(plain                 )          {
     return new CallLog({
-      answer: plain.answer ? moment__default["default"](plain.answer).toDate() : null,
+      answer: plain.answer ? moment__default['default'](plain.answer).toDate() : null,
       answered: plain.answered,
       callDirection: plain.call_direction,
       destination: {
@@ -3900,9 +3943,9 @@ class CallLog {
       },
       id: plain.id,
       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),
+      start: moment__default['default'](plain.start).toDate(),
+      end: plain.end ? moment__default['default'](plain.end).toDate() : null,
+      recordings: Recording.parseMany(plain.recordings || []),
     });
   }
 
@@ -5703,7 +5746,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                  ) => {
@@ -6039,7 +6084,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 {
@@ -6575,6 +6620,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);
   }
@@ -7085,6 +7140,7 @@ class WebRTCClient extends Emitter {
     session.sessionDescriptionHandler.remoteMediaStream.onaddtrack = onTrack;
 
     pc.oniceconnectionstatechange = () => {
+      logger.info('on ice connection state changed', { state: pc.iceConnectionState });
       if (pc.iceConnectionState === 'disconnected') {
         this.eventEmitter.emit(ON_DISCONNECTED);
       }
@@ -7244,7 +7300,7 @@ class WebRTCClient extends Emitter {
     }
     const sessionId = this.getSipSessionId(session);
 
-    getStats__default["default"](pc, (result        ) => {
+    getStats__default['default'](pc, (result        ) => {
       const { results, internal, nomore, ...stats } = result;
       this.statsIntervals[sessionId] = nomore;
 
@@ -7353,18 +7409,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;
-
-    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/lib/api/agentd.js

@@ -132,6 +132,7 @@ class IssueReporter {
                             
                                 
                                   
+                       
 
   constructor() {
     addLevelsTo(this);
@@ -143,12 +144,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;
   }
@@ -184,6 +190,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];
@@ -199,6 +206,7 @@ class IssueReporter {
           errorMessage: lastArg.message,
           errorStack: lastArg.stack,
           errorType: lastArg.constructor.name,
+          skipSendToRemote: lastArg.skipSendToRemote,
         };
       } else {
         extra = lastArg;
@@ -207,7 +215,12 @@ class IssueReporter {
       args.splice(1, 1);
     }
 
-    const date = moment__default["default"]().format('YYYY-MM-DD HH:mm:ss.SSS');
+    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;
 
@@ -227,7 +240,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      ) {
@@ -372,7 +391,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 => {
@@ -384,7 +407,7 @@ class IssueReporter {
           payload._retry = retry + 1;
         }
 
-        this._sendDebugToGrafana(body, retry + 1);
+        this._sendDebugToGrafana(payload, retry + 1);
       }, 5000 + retry * 1000);
     });
   }