@wazo/sdk 0.37.18 → 0.37.22

package/lib/lib/WazoSessionDescriptionHandler.js

@@ -107,6 +107,7 @@ class IssueReporter {
                             
                                 
                                   
+                       
 
   constructor() {
     addLevelsTo(this);
@@ -118,12 +119,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;
   }
@@ -159,6 +165,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];
@@ -174,6 +181,7 @@ class IssueReporter {
           errorMessage: lastArg.message,
           errorStack: lastArg.stack,
           errorType: lastArg.constructor.name,
+          skipSendToRemote: lastArg.skipSendToRemote,
         };
       } else {
         extra = lastArg;
@@ -182,7 +190,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;
 
@@ -202,7 +215,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      ) {
@@ -347,7 +366,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 => {
@@ -359,7 +382,7 @@ class IssueReporter {
           payload._retry = retry + 1;
         }
 
-        this._sendDebugToGrafana(body, retry + 1);
+        this._sendDebugToGrafana(payload, retry + 1);
       }, 5000 + retry * 1000);
     });
   }
@@ -387,7 +410,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;
 };
@@ -401,7 +424,7 @@ const areCandidateValid = (candidates          )          =>
     .length > 0;
 
 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;
 
@@ -419,7 +442,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}`);
@@ -465,7 +488,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;
   }
@@ -898,5 +921,5 @@ class WazoSessionDescriptionHandler extends sessionDescriptionHandler.SessionDes
   }
 }
 
-exports["default"] = WazoSessionDescriptionHandler;
+exports.default = WazoSessionDescriptionHandler;
 exports.wazoMediaStreamFactory = wazoMediaStreamFactory;

package/lib/service/CallApi.js

@@ -99,7 +99,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,
     });
@@ -1711,7 +1711,7 @@ class Recording {
               
                
 
-  static parseMany(recordings                     )              {
+  static parseMany(recordings                      = [])              {
     return recordings.map(item => Recording.parse(item));
   }
 
@@ -1719,8 +1719,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,
     });
   }
@@ -1818,7 +1818,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: {
@@ -1835,9 +1835,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 || []),
     });
   }
 
@@ -2145,6 +2145,7 @@ class IssueReporter {
                             
                                 
                                   
+                       
 
   constructor() {
     addLevelsTo(this);
@@ -2156,12 +2157,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;
   }
@@ -2197,6 +2203,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];
@@ -2212,6 +2219,7 @@ class IssueReporter {
           errorMessage: lastArg.message,
           errorStack: lastArg.stack,
           errorType: lastArg.constructor.name,
+          skipSendToRemote: lastArg.skipSendToRemote,
         };
       } else {
         extra = lastArg;
@@ -2220,7 +2228,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;
 
@@ -2240,7 +2253,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      ) {
@@ -2385,7 +2404,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 => {
@@ -2397,7 +2420,7 @@ class IssueReporter {
           payload._retry = retry + 1;
         }
 
-        this._sendDebugToGrafana(body, retry + 1);
+        this._sendDebugToGrafana(payload, retry + 1);
       }, 5000 + retry * 1000);
     });
   }
@@ -3115,7 +3138,8 @@ class ExternalApp {
                              
                
                
-                
+                 
+                      
  
 
 class Meeting {
@@ -3127,6 +3151,7 @@ class Meeting {
                
                
                  
+                      
                             
 
   static parse(plain                         )          {
@@ -3138,14 +3163,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;
@@ -3153,6 +3192,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';
@@ -3230,8 +3270,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),
@@ -3290,7 +3333,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,
@@ -3382,7 +3425,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,

package/lib/service/IssueReporter.js

@@ -99,6 +99,7 @@ class IssueReporter {
                             
                                 
                                   
+                       
 
   constructor() {
     addLevelsTo(this);
@@ -110,12 +111,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;
   }
@@ -151,6 +157,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];
@@ -166,6 +173,7 @@ class IssueReporter {
           errorMessage: lastArg.message,
           errorStack: lastArg.stack,
           errorType: lastArg.constructor.name,
+          skipSendToRemote: lastArg.skipSendToRemote,
         };
       } else {
         extra = lastArg;
@@ -174,7 +182,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;
 
@@ -194,7 +207,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      ) {
@@ -339,7 +358,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 => {
@@ -351,7 +374,7 @@ class IssueReporter {
           payload._retry = retry + 1;
         }
 
-        this._sendDebugToGrafana(body, retry + 1);
+        this._sendDebugToGrafana(payload, retry + 1);
       }, 5000 + retry * 1000);
     });
   }

package/lib/service/__tests__/IssueReporter.test.js

@@ -99,6 +99,7 @@ class IssueReporter {
                             
                                 
                                   
+                       
 
   constructor() {
     addLevelsTo(this);
@@ -110,12 +111,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;
   }
@@ -151,6 +157,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];
@@ -166,6 +173,7 @@ class IssueReporter {
           errorMessage: lastArg.message,
           errorStack: lastArg.stack,
           errorType: lastArg.constructor.name,
+          skipSendToRemote: lastArg.skipSendToRemote,
         };
       } else {
         extra = lastArg;
@@ -174,7 +182,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;
 
@@ -194,7 +207,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      ) {
@@ -339,7 +358,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 => {
@@ -351,7 +374,7 @@ class IssueReporter {
           payload._retry = retry + 1;
         }
 
-        this._sendDebugToGrafana(body, retry + 1);
+        this._sendDebugToGrafana(payload, retry + 1);
       }, 5000 + retry * 1000);
     });
   }