@wazo/sdk 0.37.20 → 0.37.24

package/lib/simple/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 => {
@@ -500,7 +523,7 @@ class Heartbeat {
 
 //      
 
-const SOCKET_EVENTS$1 = {
+const SOCKET_EVENTS = {
   ON_OPEN: 'onopen',
   ON_MESSAGE: 'onmessage',
   ON_ERROR: 'onerror',
@@ -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,
@@ -652,16 +676,16 @@ class WebSocketClient extends Emitter {
 
     this.socket.onopen = () => {
       logger$1.info('on Wazo WS open', { method: 'connect', host: this.host });
-      this.eventEmitter.emit(SOCKET_EVENTS$1.ON_OPEN);
+      this.eventEmitter.emit(SOCKET_EVENTS.ON_OPEN);
     };
 
     this.socket.onerror = event => {
       logger$1.error('on Wazo WS error', event.target);
-      this.eventEmitter.emit(SOCKET_EVENTS$1.ON_ERROR, event);
+      this.eventEmitter.emit(SOCKET_EVENTS.ON_ERROR, event);
     };
 
     this.socket.onmessage = (event              ) => {
-      this.eventEmitter.emit(SOCKET_EVENTS$1.ON_MESSAGE, event.data);
+      this.eventEmitter.emit(SOCKET_EVENTS.ON_MESSAGE, event.data);
 
       const message = JSON.parse(typeof event.data === 'string' ? event.data : '{}');
       let { name } = message;
@@ -694,11 +718,11 @@ class WebSocketClient extends Emitter {
         token: this.token,
       });
       this.initialized = false;
-      this.eventEmitter.emit(SOCKET_EVENTS$1.ON_CLOSE, event);
+      this.eventEmitter.emit(SOCKET_EVENTS.ON_CLOSE, event);
 
       switch (event.code) {
         case 4002:
-          this.eventEmitter.emit(SOCKET_EVENTS$1.ON_AUTH_FAILED);
+          this.eventEmitter.emit(SOCKET_EVENTS.ON_AUTH_FAILED);
           break;
       }
     };
@@ -814,7 +838,7 @@ class WebSocketClient extends Emitter {
         break;
       case 'start':
         this.initialized = true;
-        this.eventEmitter.emit(SOCKET_EVENTS$1.INITIALIZED);
+        this.eventEmitter.emit(SOCKET_EVENTS.INITIALIZED);
         break;
       default:
         this.eventEmitter.emit('message', message);
@@ -861,7 +885,7 @@ class WebSocketClient extends Emitter {
     logger$1.log('heartbeat timed out', { host: this.host, token: this.token });
 
     this.close();
-    this.eventEmitter.emit(SOCKET_EVENTS$1.ON_CLOSE, new Error('Websocket ping failure.'));
+    this.eventEmitter.emit(SOCKET_EVENTS.ON_CLOSE, new Error('Websocket ping failure.'));
 
     if (this.onHeartBeatTimeout) {
       this.onHeartBeatTimeout();
@@ -936,11 +960,12 @@ WebSocketClient.eventLists = [
   AGENT_UNPAUSED,
   CONFERENCE_ADHOC_PARTICIPANT_LEFT,
   CONFERENCE_ADHOC_DELETED,
+  MEETING_USER_PROGRESS,
 ];
 
 var WebSocketClient$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  SOCKET_EVENTS: SOCKET_EVENTS$1,
+  SOCKET_EVENTS: SOCKET_EVENTS,
   AUTH_SESSION_EXPIRE_SOON: AUTH_SESSION_EXPIRE_SOON,
   FAVORITE_ADDED: FAVORITE_ADDED,
   FAVORITE_DELETED: FAVORITE_DELETED,
@@ -1006,16 +1031,17 @@ 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
 });
 
 //      
 
-const { SOCKET_EVENTS, ...OTHER_EVENTS } = WebSocketClient$1;
-const ALL_EVENTS = [...Object.values(SOCKET_EVENTS), ...Object.values(OTHER_EVENTS)];
+const { SOCKET_EVENTS: SOCKET_EVENTS$1, ...OTHER_EVENTS } = WebSocketClient$1;
+const ALL_EVENTS = [...Object.values(SOCKET_EVENTS$1), ...Object.values(OTHER_EVENTS)];
 
-const logger = IssueReporter$1.loggerFor('simple-ws-client');
+const logger$2 = IssueReporter$1.loggerFor('simple-ws-client');
 
 class Websocket extends Emitter {
                            
@@ -1029,9 +1055,9 @@ class Websocket extends Emitter {
       // $FlowFixMe
       this[key] = OTHER_EVENTS[key];
     });
-    Object.keys(SOCKET_EVENTS).forEach(key => {
+    Object.keys(SOCKET_EVENTS$1).forEach(key => {
       // $FlowFixMe
-      this[key] = SOCKET_EVENTS[key];
+      this[key] = SOCKET_EVENTS$1[key];
     });
     this.eventLists = WebSocketClient.eventLists;
 
@@ -1039,7 +1065,7 @@ class Websocket extends Emitter {
   }
 
   open(host        , session         ) {
-    logger.info('open simple WebSocket', { host, token: session.token });
+    logger$2.info('open simple WebSocket', { host, token: session.token });
     this.ws = new WebSocketClient(
       {
         host,
@@ -1067,7 +1093,7 @@ class Websocket extends Emitter {
   }
 
   updateToken(token        ) {
-    logger.info('update token via simple Websocket', { token, ws: !!this.ws });
+    logger$2.info('update token via simple Websocket', { token, ws: !!this.ws });
 
     if (!this.ws) {
       return;