@wazo/sdk 0.37.20 → 0.37.24

package/lib/checker/checks/wazo-websocket.js

@@ -43,7 +43,7 @@ const isMobile = () => typeof navigator !== 'undefined' && navigator.product ===
 
 /*       */
 
-IssueReporter$1 ? IssueReporter$1.loggerFor('api') : console;
+const logger = IssueReporter$1 ? IssueReporter$1.loggerFor('api') : console;
 
 // Use a function here to be able to mock it in tests
 const realFetch = () => {
@@ -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,
@@ -595,7 +619,7 @@ const BLACKLIST_EVENTS = [
 ];
 
 const HEARTBEAT_ENGINE_VERSION = '20.09';
-const logger = IssueReporter$1.loggerFor('wazo-ws');
+const logger$1 = IssueReporter$1.loggerFor('wazo-ws');
 const messageLogger = IssueReporter$1.loggerFor('wazo-ws-message');
 
 class WebSocketClient extends Emitter {
@@ -644,19 +668,19 @@ class WebSocketClient extends Emitter {
   }
 
   connect() {
-    logger.info('connect method started', { host: this.host, token: this.token });
+    logger$1.info('connect method started', { host: this.host, token: this.token });
     this.socket = new ReconnectingWebSocket__default['default'](this._getUrl.bind(this), [], this.options);
     if (this.options.binaryType) {
       this.socket.binaryType = this.options.binaryType;
     }
 
     this.socket.onopen = () => {
-      logger.info('on Wazo WS open', { method: 'connect', host: this.host });
+      logger$1.info('on Wazo WS open', { method: 'connect', host: this.host });
       this.eventEmitter.emit(SOCKET_EVENTS.ON_OPEN);
     };
 
     this.socket.onerror = event => {
-      logger.error('on Wazo WS error', event.target);
+      logger$1.error('on Wazo WS error', event.target);
       this.eventEmitter.emit(SOCKET_EVENTS.ON_ERROR, event);
     };
 
@@ -686,7 +710,7 @@ class WebSocketClient extends Emitter {
 
     this.socket.onclose = event => {
       // Can't be converted to JSON (circular structure)
-      logger.info('on Wazo WS close', {
+      logger$1.info('on Wazo WS close', {
         reason: event.reason,
         code: event.code,
         readyState: event.target.readyState,
@@ -704,12 +728,12 @@ class WebSocketClient extends Emitter {
     };
 
     this.socket.onerror = event => {
-      logger.info('Wazo WS error', { message: event.message, code: event.code, readyState: event.target.readyState });
+      logger$1.info('Wazo WS error', { message: event.message, code: event.code, readyState: event.target.readyState });
     };
   }
 
   close(force          = false)       {
-    logger.info('Wazo WS close', { socket: !!this.socket, host: this.host, token: this.token });
+    logger$1.info('Wazo WS close', { socket: !!this.socket, host: this.host, token: this.token });
 
     if (!this.socket) {
       return;
@@ -727,7 +751,7 @@ class WebSocketClient extends Emitter {
 
   updateToken(token        ) {
     this.token = token;
-    logger.info('Wazo WS updating token', { url: this._getUrl(), token, socket: !!this.socket });
+    logger$1.info('Wazo WS updating token', { url: this._getUrl(), token, socket: !!this.socket });
 
     if (this.socket) {
       // If still connected, send the token to the WS
@@ -745,7 +769,7 @@ class WebSocketClient extends Emitter {
   }
 
   startHeartbeat() {
-    logger.info('Wazo WS start heartbeat', { host: this.host, token: this.token });
+    logger$1.info('Wazo WS start heartbeat', { host: this.host, token: this.token });
 
     if (!this.socket) {
       this.heartbeat.stop();
@@ -759,7 +783,7 @@ class WebSocketClient extends Emitter {
   }
 
   stopHeartbeat() {
-    logger.info('Wazo WS stop heartbeat', { host: this.host, token: this.token });
+    logger$1.info('Wazo WS stop heartbeat', { host: this.host, token: this.token });
 
     this.heartbeat.stop();
   }
@@ -789,7 +813,7 @@ class WebSocketClient extends Emitter {
   }
 
   reconnect(reason        ) {
-    logger.info('Wazo WS reconnect', { reason, socket: !!this.socket, host: this.host, token: this.token });
+    logger$1.info('Wazo WS reconnect', { reason, socket: !!this.socket, host: this.host, token: this.token });
     if (!this.socket) {
       return;
     }
@@ -845,7 +869,7 @@ class WebSocketClient extends Emitter {
       this.close();
     }
     const url = `wss://${this.host || ''}/api/websocketd/?token=${this.token || ''}&version=${this.version}`;
-    logger.log('Wazo WS url computed to reconnect', { url });
+    logger$1.log('Wazo WS url computed to reconnect', { url });
 
     return url;
   }
@@ -853,12 +877,12 @@ class WebSocketClient extends Emitter {
   _onHeartbeat(message        ) {
     if (message.payload === 'pong') {
       this.heartbeat.onHeartbeat();
-      logger.log('on heartbeat received from Wazo WS');
+      logger$1.log('on heartbeat received from Wazo WS');
     }
   }
 
   async _onHeartbeatTimeout() {
-    logger.log('heartbeat timed out', { host: this.host, token: this.token });
+    logger$1.log('heartbeat timed out', { host: this.host, token: this.token });
 
     this.close();
     this.eventEmitter.emit(SOCKET_EVENTS.ON_CLOSE, new Error('Websocket ping failure.'));
@@ -936,6 +960,7 @@ WebSocketClient.eventLists = [
   AGENT_UNPAUSED,
   CONFERENCE_ADHOC_PARTICIPANT_LEFT,
   CONFERENCE_ADHOC_DELETED,
+  MEETING_USER_PROGRESS,
 ];
 
 var wazoWebsocket = {