@wazo/sdk 0.37.20 → 0.37.24

package/lib/lib/WazoSessionDescriptionHandler.js

@@ -21,7 +21,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 = () => {
@@ -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,6 +190,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;
@@ -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 => {
@@ -396,10 +419,6 @@ const getSrflxOrRelay = (candidates          )           =>
   candidates
     .filter(candidate => candidate && (candidate.type === 'srflx' || candidate.type === 'relay'));
 
-const areCandidateValid = (candidates          )          =>
-  getSrflxOrRelay(candidates)
-    .length > 0;
-
 const fixSdp = (sdp        , candidates          , forcePort          = true)         => {
   const parsedSdp = sdpParser__default['default'].parse(sdp);
   const mainCandidate = getSrflxOrRelay(candidates)[0];
@@ -431,8 +450,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        )                       => {
@@ -622,38 +639,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)                {

package/lib/service/CallApi.js

@@ -82,6 +82,9 @@ class Call {
                      
 
   static parseMany(plain                     )              {
+    if (!plain) {
+      return [];
+    }
     return plain.map((plainCall              ) => Call.parse(plainCall));
   }
 
@@ -1040,6 +1043,9 @@ class Contact {
   }
 
   static parseMany(response                  )                 {
+    if (!response || !response.results) {
+      return [];
+    }
     return response.results.map(r => Contact.parse(r, response.column_types));
   }
 
@@ -1712,6 +1718,9 @@ class Recording {
                
 
   static parseMany(recordings                      = [])              {
+    if (!recordings) {
+      return [];
+    }
     return recordings.map(item => Recording.parse(item));
   }
 
@@ -1813,6 +1822,10 @@ class CallLog {
   }
 
   static parseMany(plain          )                 {
+    if (!plain || !plain.items) {
+      return [];
+    }
+
     return plain.items.map(item => CallLog.parse(item));
   }
 
@@ -2145,6 +2158,7 @@ class IssueReporter {
                             
                                 
                                   
+                       
 
   constructor() {
     addLevelsTo(this);
@@ -2156,12 +2170,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 +2216,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 +2232,7 @@ class IssueReporter {
           errorMessage: lastArg.message,
           errorStack: lastArg.stack,
           errorType: lastArg.constructor.name,
+          skipSendToRemote: lastArg.skipSendToRemote,
         };
       } else {
         extra = lastArg;
@@ -2220,6 +2241,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;
@@ -2240,7 +2266,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 +2417,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 => {
@@ -2432,7 +2468,7 @@ var IssueReporter$1 = new IssueReporter();
 
 const methods = ['head', 'get', 'post', 'put', 'delete'];
 
-const logger$1 = 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 = () => {
@@ -2571,7 +2607,7 @@ class ApiRequester {
     };
 
     if (this.refreshTokenPromise) {
-      logger$1.info('A token is already refreshing, waiting ...', { url });
+      logger.info('A token is already refreshing, waiting ...', { url });
       await this.refreshTokenPromise;
     }
 
@@ -2591,7 +2627,7 @@ class ApiRequester {
         return promise.then(async (err        ) => {
           // Check if the token is still valid
           if (firstCall && this._checkTokenExpired(response, err)) {
-            logger$1.warn('token expired', { error: err.reason });
+            logger.warn('token expired', { error: err.reason });
             // Replay the call after refreshing the token
             return this._replayWithNewToken(err, path, method, body, headers, parse);
           }
@@ -2601,7 +2637,7 @@ class ApiRequester {
             : exceptionClass.fromResponse(err, response.status);
 
           if (this.shouldLogErrors) {
-            logger$1.error('API error', error);
+            logger.error('API error', error);
           }
 
           throw error;
@@ -2611,7 +2647,7 @@ class ApiRequester {
       return newParse(response, isJson);
     }).catch(error => {
       if (this.shouldLogErrors) {
-        logger$1.error('Fetch failed', { url, options, message: error.message, stack: error.stack });
+        logger.error('Fetch failed', { url, options, message: error.message, stack: error.stack });
       }
 
       throw error;
@@ -2639,13 +2675,13 @@ class ApiRequester {
   ) {
     const isTokenNotFound = this._isTokenNotFound(err);
     let newPath = path;
-    logger$1.info('refreshing token', { inProgress: !!this.refreshTokenPromise });
+    logger.info('refreshing token', { inProgress: !!this.refreshTokenPromise });
 
     this.refreshTokenPromise = this.refreshTokenPromise || this.refreshTokenCallback();
 
     return this.refreshTokenPromise.then(() => {
       this.refreshTokenPromise = null;
-      logger$1.info('token refreshed', { isTokenNotFound });
+      logger.info('token refreshed', { isTokenNotFound });
       if (isTokenNotFound) {
         const pathParts = path.split('/');
         pathParts.pop();
@@ -3115,8 +3151,9 @@ class ExternalApp {
                              
                
                
-                 
+                
                       
+                        
  
 
 class Meeting {
@@ -3127,9 +3164,10 @@ class Meeting {
                
                
                
-                 
+                    
                       
                             
+                     
 
   static parse(plain                         )          {
     return new Meeting({
@@ -3139,24 +3177,43 @@ class Meeting {
       ownerUuids: plain.owner_uuids,
       port: plain.port,
       uuid: plain.uuid,
-      number: plain.number,
+      extension: plain.exten,
       persistent: plain.persistent,
+      creationTime: moment__default['default'](plain.creation_time).toDate(),
     });
   }
 
+  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,
+    extension,
+    persistent,
+    creationTime,
+  }         = {}) {
     this.guestSipAuthorization = guestSipAuthorization;
     this.uri = uri;
     this.name = name;
     this.ownerUuids = ownerUuids;
     this.port = port;
     this.uuid = uuid;
-    this.number = number;
+    this.extension = extension;
     this.persistent = persistent;
+    this.creationTime = creationTime;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'Meeting';
@@ -3234,8 +3291,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),
@@ -3288,6 +3348,10 @@ class ChatMessage {
                 
 
   static parseMany(plain                         )                     {
+    if (!plain || !plain.items) {
+      return [];
+    }
+
     return plain.items.map(item => ChatMessage.parse(item));
   }
 
@@ -3397,6 +3461,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;
 
@@ -3451,7 +3518,7 @@ const TRANSFER_FLOW_BLIND = 'blind';
 
 // const MINIMUM_WAZO_ENGINE_VERSION_FOR_CTI_HOLD = '20.11';
 
-IssueReporter$1 ? IssueReporter$1.loggerFor('cti-phone') : console;
+const logger$1 = IssueReporter$1 ? IssueReporter$1.loggerFor('cti-phone') : console;
 
 /*       */
 
@@ -3787,6 +3854,9 @@ class ChatRoom {
                          
 
   static parseMany(plain                  )                  {
+    if (!plain || !plain.items) {
+      return [];
+    }
     return plain.items.map(item => ChatRoom.parse(item));
   }
 
@@ -4435,7 +4505,7 @@ const AGENTD_VERSION = '1.0';
 const WEBHOOKD_VERSION = '1.0';
 const AMID_VERSION = '1.0';
 
-const logger = IssueReporter$1 ? IssueReporter$1.loggerFor('api') : console;
+const logger$2 = IssueReporter$1 ? IssueReporter$1.loggerFor('api') : console;
 
 class ApiClient {
                        
@@ -4487,12 +4557,12 @@ class ApiClient {
   }
 
   async forceRefreshToken() {
-    logger.info('forcing refresh token, calling callback');
+    logger$2.info('forcing refresh token, calling callback');
     return this.refreshTokenCallback();
   }
 
   async refreshTokenCallback() {
-    logger.info('refresh token callback called', {
+    logger$2.info('refresh token callback called', {
       refreshToken: this.refreshToken,
       refreshBackend: this.refreshBackend,
       refreshExpiration: this.refreshExpiration,
@@ -4510,7 +4580,7 @@ class ApiClient {
       this.isMobile,
     );
 
-    logger.info('token refreshed', { token: session.token });
+    logger$2.info('token refreshed', { token: session.token });
 
     if (this.onRefreshToken) {
       this.onRefreshToken(session.token, session);

package/lib/service/IssueReporter.js

@@ -13,7 +13,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 = () => {
@@ -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,6 +182,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;
@@ -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 => {

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

@@ -13,7 +13,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 = () => {
@@ -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,6 +182,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;
@@ -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 => {