@wazo/sdk 0.37.0-rc.5 → 0.37.2

package/lib/utils/__tests__/api-requester.test.js

@@ -311,7 +311,13 @@ class IssueReporter {
   }
 
   _isLevelAbove(level1        , level2        ) {
-    return LOG_LEVELS.indexOf(level1) > LOG_LEVELS.indexOf(level2);
+    const index1 = LOG_LEVELS.indexOf(level1);
+    const index2 = LOG_LEVELS.indexOf(level2);
+    if (index1 === -1 || index2 === -1) {
+      return false;
+    }
+
+    return index1 > index2;
   }
 
   _makeCategory(category        ) {
@@ -369,6 +375,7 @@ class ApiRequester {
                        
                                  
                                      
+                           
 
                  
                 
@@ -408,6 +415,8 @@ class ApiRequester {
       this.token = token;
     }
 
+    this.shouldLogErrors = true;
+
     methods.forEach(method => {
       // $FlowFixMe
       ApiRequester.prototype[method] = function sugar(...args) {
@@ -431,6 +440,14 @@ class ApiRequester {
     this.fetchOptions = options;
   }
 
+  disableErrorLogging() {
+    this.shouldLogErrors = false;
+  }
+
+  enableErrorLogging() {
+    this.shouldLogErrors = true;
+  }
+
   async call(
     path        ,
     method         = 'get',
@@ -491,7 +508,9 @@ class ApiRequester {
             ? exceptionClass.fromText(err, response.status)
             : exceptionClass.fromResponse(err, response.status);
 
-          logger.error('API error', error);
+          if (this.shouldLogErrors) {
+            logger.error('API error', error);
+          }
 
           throw error;
         });
@@ -499,7 +518,9 @@ class ApiRequester {
 
       return newParse(response, isJson);
     }).catch(error => {
-      logger.error('Fetch failed', { url, options, message: error.message, stack: error.stack });
+      if (this.shouldLogErrors) {
+        logger.error('Fetch failed', { url, options, message: error.message, stack: error.stack });
+      }
 
       throw error;
     });
@@ -621,11 +642,16 @@ describe('Retrieving headers', () => {
 });
 
 describe('Calling fetch', () => {
-  it('should call fetch without body but query string in get method', () => {
+  it('should call fetch without body but query string in get method', async () => {
     jest.mock('node-fetch/lib/index', () => {});
-    global.fetch = jest.fn(() => Promise.resolve({ json: () => Promise.resolve({}) }));
+    global.fetch = jest.fn(() => Promise.resolve({
+      json: () => Promise.resolve({}),
+      headers: {
+        get: () => '',
+      },
+    }));
 
-    new ApiRequester({ server }).call(path, method, body, {});
+    await new ApiRequester({ server }).call(path, method, body, {});
     expect(global.fetch).toBeCalledWith(url, { method: 'get', body: null, headers: {}, agent: null });
   });
 });

package/lib/utils/api-requester.js

@@ -313,7 +313,13 @@ class IssueReporter {
   }
 
   _isLevelAbove(level1        , level2        ) {
-    return LOG_LEVELS.indexOf(level1) > LOG_LEVELS.indexOf(level2);
+    const index1 = LOG_LEVELS.indexOf(level1);
+    const index2 = LOG_LEVELS.indexOf(level2);
+    if (index1 === -1 || index2 === -1) {
+      return false;
+    }
+
+    return index1 > index2;
   }
 
   _makeCategory(category        ) {
@@ -371,6 +377,7 @@ class ApiRequester {
                        
                                  
                                      
+                           
 
                  
                 
@@ -410,6 +417,8 @@ class ApiRequester {
       this.token = token;
     }
 
+    this.shouldLogErrors = true;
+
     methods.forEach(method => {
       // $FlowFixMe
       ApiRequester.prototype[method] = function sugar(...args) {
@@ -433,6 +442,14 @@ class ApiRequester {
     this.fetchOptions = options;
   }
 
+  disableErrorLogging() {
+    this.shouldLogErrors = false;
+  }
+
+  enableErrorLogging() {
+    this.shouldLogErrors = true;
+  }
+
   async call(
     path        ,
     method         = 'get',
@@ -493,7 +510,9 @@ class ApiRequester {
             ? exceptionClass.fromText(err, response.status)
             : exceptionClass.fromResponse(err, response.status);
 
-          logger.error('API error', error);
+          if (this.shouldLogErrors) {
+            logger.error('API error', error);
+          }
 
           throw error;
         });
@@ -501,7 +520,9 @@ class ApiRequester {
 
       return newParse(response, isJson);
     }).catch(error => {
-      logger.error('Fetch failed', { url, options, message: error.message, stack: error.stack });
+      if (this.shouldLogErrors) {
+        logger.error('Fetch failed', { url, options, message: error.message, stack: error.stack });
+      }
 
       throw error;
     });

package/lib/web-rtc-client.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 require('webrtc-adapter');
 var userAgentState = require('sip.js/lib/api/user-agent-state');
-require('sip.js/lib/api/message');
 var parser = require('sip.js/lib/core/messages/parser');
 var constants = require('sip.js/lib/core/messages/methods/constants');
 var uri = require('sip.js/lib/grammar/uri');
@@ -147,6 +146,7 @@ class ApiRequester {
                        
                                  
                                      
+                           
 
                  
                 
@@ -186,6 +186,8 @@ class ApiRequester {
       this.token = token;
     }
 
+    this.shouldLogErrors = true;
+
     methods.forEach(method => {
       // $FlowFixMe
       ApiRequester.prototype[method] = function sugar(...args) {
@@ -209,6 +211,14 @@ class ApiRequester {
     this.fetchOptions = options;
   }
 
+  disableErrorLogging() {
+    this.shouldLogErrors = false;
+  }
+
+  enableErrorLogging() {
+    this.shouldLogErrors = true;
+  }
+
   async call(
     path        ,
     method         = 'get',
@@ -269,7 +279,9 @@ class ApiRequester {
             ? exceptionClass.fromText(err, response.status)
             : exceptionClass.fromResponse(err, response.status);
 
-          logger$2.error('API error', error);
+          if (this.shouldLogErrors) {
+            logger$2.error('API error', error);
+          }
 
           throw error;
         });
@@ -277,7 +289,9 @@ class ApiRequester {
 
       return newParse(response, isJson);
     }).catch(error => {
-      logger$2.error('Fetch failed', { url, options, message: error.message, stack: error.stack });
+      if (this.shouldLogErrors) {
+        logger$2.error('Fetch failed', { url, options, message: error.message, stack: error.stack });
+      }
 
       throw error;
     });
@@ -588,7 +602,13 @@ class IssueReporter {
   }
 
   _isLevelAbove(level1        , level2        ) {
-    return LOG_LEVELS.indexOf(level1) > LOG_LEVELS.indexOf(level2);
+    const index1 = LOG_LEVELS.indexOf(level1);
+    const index2 = LOG_LEVELS.indexOf(level2);
+    if (index1 === -1 || index2 === -1) {
+      return false;
+    }
+
+    return index1 > index2;
   }
 
   _makeCategory(category        ) {
@@ -617,23 +637,6 @@ const areCandidateValid = (candidates          )          =>
   getSrflxOrRelay(candidates)
     .length > 0;
 
-const toggleVideoDirection = (sdp        , direction         )         => {
-  const parsedSdp = sdpParser__default['default'].parse(sdp);
-  parsedSdp.media = parsedSdp.media.map(media => ({
-    ...media,
-    ...(media.type === 'video' ? { direction } : {}),
-  }));
-
-  return sdpParser__default['default'].write(parsedSdp);
-};
-
-const deactivateVideoModifier = (rawDescription        )                  => {
-  const description = rawDescription;
-  description.sdp = toggleVideoDirection(description.sdp, 'inactive');
-
-  return Promise.resolve(description);
-};
-
 const hasAnActiveVideo = (sdp         )          => {
   if (!sdp) {
     return false;
@@ -745,6 +748,7 @@ class WazoSessionDescriptionHandler extends sessionDescriptionHandler.SessionDes
     const iceRestart = options.offerOptions ? options.offerOptions.iceRestart : false;
 
     const isConference = options ? !!options.conference : false;
+    const audioOnly = options ? !!options.audioOnly : false;
 
     // We should wait for ice when iceRestart (reinvite) or for the first invite
     // We shouldn't wait for ice when holding or resuming the call
@@ -771,16 +775,16 @@ class WazoSessionDescriptionHandler extends sessionDescriptionHandler.SessionDes
     };
 
     return this.getLocalMediaStream(options)
-      .then(() => this.updateDirection(options, isConference))
+      .then(() => this.updateDirection(options, isConference, audioOnly))
       .then(() => this.createDataChannel(options))
       .then(() => {
-        if (isConference && (options.constraints && !options.constraints.video) && !('hold' in options)) {
+        if (isConference && (options.constraints && !options.constraints.video) && !('hold' in options) && !audioOnly) {
           // Add a video an empty bundle to be able to replaceTrack when joining a conference without video
           this.peerConnection.addTransceiver('video', { streams: [this._localMediaStream], direction: 'sendrecv' });
         }
       })
       .then(() => this.createLocalOfferOrAnswer(options))
-      .then((sessionDescription) => this.setLocalSessionDescription(sessionDescription))
+      .then(sessionDescription => this.setLocalSessionDescription(sessionDescription))
       .then(() => this.waitForIceGatheringComplete(iceRestart, iceTimeout))
       .then(() => this.getLocalSessionDescription())
       .then(description => {
@@ -903,7 +907,8 @@ class WazoSessionDescriptionHandler extends sessionDescriptionHandler.SessionDes
   }
 
   // Overridden to send `inactive` in conference
-  updateDirection(options                                   , isConference          = false)                {
+  updateDirection(options                                   , isConference          = false,
+    audioOnly          = false)                {
     if (this._peerConnection === undefined) {
       return Promise.reject(new Error('Peer connection closed.'));
     }
@@ -918,14 +923,17 @@ class WazoSessionDescriptionHandler extends sessionDescriptionHandler.SessionDes
         // if we are stable, assume we are creating a local offer
         this.logger.debug('SessionDescriptionHandler.updateDirection - setting offer direction');
         // determine the direction to offer given the current direction and hold state
-        const directionToOffer = (currentDirection        )         => {
+        const directionToOffer = (currentDirection        , transceiver         /* RTCRtpTransceiver */)         => {
           if (isConference) {
+            if (audioOnly && transceiver.receiver.track && transceiver.receiver.track.kind === 'video') {
+              return 'sendonly';
+            }
             return options && options.hold ? 'sendonly' : 'sendrecv';
           }
 
           switch (currentDirection) {
             case 'inactive':
-              return options && options.hold ? 'inactive' : 'recvonly';
+              return options && options.hold ? 'inactive' : (isConference && !audioOnly ? 'sendrecv' : 'recvonly');
             case 'recvonly':
               return options && options.hold ? 'inactive' : 'recvonly';
             case 'sendonly':
@@ -941,7 +949,7 @@ class WazoSessionDescriptionHandler extends sessionDescriptionHandler.SessionDes
         // set the transceiver direction to the offer direction
         this._peerConnection.getTransceivers().forEach((transceiver) => {
           if (transceiver.direction /* guarding, but should always be true */) {
-            const offerDirection = directionToOffer(transceiver.direction);
+            const offerDirection = directionToOffer(transceiver.direction, transceiver);
             if (transceiver.direction !== offerDirection) {
               // eslint-disable-next-line no-param-reassign
               transceiver.direction = offerDirection;
@@ -1000,6 +1008,13 @@ class WazoSessionDescriptionHandler extends sessionDescriptionHandler.SessionDes
         // set the transceiver direction to the answer direction
         this._peerConnection.getTransceivers().forEach((transceiver) => {
           if (transceiver.direction /* guarding, but should always be true */) {
+            const { receiver } = transceiver;
+            if (isConference && audioOnly && receiver.track && receiver.track.kind === 'video') {
+              // eslint-disable-next-line no-param-reassign
+              transceiver.direction = 'inactive';
+              return;
+            }
+
             if (transceiver.direction !== 'stopped' && transceiver.direction !== answerDirection) {
               // eslint-disable-next-line no-param-reassign
               transceiver.direction = answerDirection;
@@ -1038,8 +1053,8 @@ class WazoSessionDescriptionHandler extends sessionDescriptionHandler.SessionDes
       }
       const sender = pc.getSenders().find((otherSender) => otherSender.track && otherSender.track.kind === kind);
 
-      // Do not reuse sender tracks in SFU
-      if (sender && !sfu) {
+      // Do not reuse sender video tracks in SFU
+      if (sender && (!sfu || newTrack.kind === 'audio')) {
         trackUpdates.push(
           new Promise((resolve) => {
             this.logger.debug(`SessionDescriptionHandler.setLocalMediaStream - replacing sender ${kind} track`);
@@ -2105,7 +2120,7 @@ class Contact {
 
     return new Contact({
       sourceId: single.id || '',
-      name: single.displayName,
+      name: single.displayName || '',
       number: numbers.length ? numbers[0].number : '',
       numbers,
       emails,
@@ -2136,7 +2151,7 @@ class Contact {
 
     return new Contact({
       sourceId: single.id || '',
-      name: single.name,
+      name: single.name || '',
       number: numbers.length ? numbers[0].number : '',
       numbers,
       emails,
@@ -2237,7 +2252,7 @@ class Contact {
   }                   = {}) {
     this.id = id;
     this.uuid = uuid;
-    this.name = name;
+    this.name = name || '';
     this.number = number;
     this.numbers = numbers;
     this.email = email;
@@ -3546,17 +3561,66 @@ var updateFrom = (instance     , from     ) => {
 
 //      
 
+                                 
+                   
+                    
+                   
+                     
+               
+  
+
+                           
+                   
+             
+                   
+              
+               
+ 
+
+class Recording {
+                   
+             
+                   
+              
+               
+
+  static parseMany(recordings                     )              {
+    return recordings.map(item => Recording.parse(item));
+  }
+
+  static parse(plain                   )            {
+    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(),
+      uuid: plain.uuid,
+    });
+  }
+
+  constructor({ deleted, end, fileName, start, uuid }                    ) {
+    this.deleted = deleted;
+    this.end = end;
+    this.fileName = fileName;
+    this.start = start;
+    this.uuid = uuid;
+  }
+}
+
+//      
+
                         
-                 
+                  
                     
                          
                                 
                             
                    
-              
+               
              
                            
                       
+                                  
                               
                          
                 
@@ -3569,7 +3633,7 @@ var updateFrom = (instance     , from     ) => {
   
 
                          
-               
+                
                     
                           
                         
@@ -3584,13 +3648,14 @@ var updateFrom = (instance     , from     ) => {
              
                    
               
-            
+             
+                          
   
 
 class CallLog {
                
 
-               
+                
                     
                          
                         
@@ -3607,7 +3672,7 @@ class CallLog {
              
                    
               
-            
+             
 
   static merge(current                , toMerge                )                  {
     const onlyUnique = (value, index, self) => self.indexOf(value) === index;
@@ -3624,7 +3689,7 @@ class CallLog {
 
   static parse(plain                 )          {
     return new CallLog({
-      answer: moment__default['default'](plain.answer).toDate(),
+      answer: plain.answer ? moment__default['default'](plain.answer).toDate() : null,
       answered: plain.answered,
       callDirection: plain.call_direction,
       destination: {
@@ -3638,13 +3703,14 @@ class CallLog {
       id: plain.id,
       duration: (plain.duration || 0) * 1000, // duration is in seconds
       start: moment__default['default'](plain.start).toDate(),
-      end: moment__default['default'](plain.end).toDate(),
+      end: plain.end ? moment__default['default'](plain.end).toDate() : null,
+      recordings: Recording.parseMany(plain.recordings),
     });
   }
 
   static parseNew(plain                 , session         )          {
     return new CallLog({
-      answer: moment__default['default'](plain.answer).toDate(),
+      answer: plain.answer ? moment__default['default'](plain.answer).toDate() : null,
       answered: plain.answered,
       callDirection: plain.call_direction,
       destination: {
@@ -3658,7 +3724,8 @@ class CallLog {
       id: plain.id,
       duration: (plain.duration || 0) * 1000, // duration is in seconds
       start: moment__default['default'](plain.start).toDate(),
-      end: moment__default['default'](plain.end).toDate(),
+      end: plain.end ? moment__default['default'](plain.end).toDate() : null,
+      recordings: Recording.parseMany(plain.recordings),
       // @TODO: FIXME add verification declined vs missed call
       newMissedCall: session
         && session.hasExtension(plain.requested_extension || plain.destination_extension) && !plain.answered,
@@ -4894,6 +4961,10 @@ class ApiClient {
     this.fetchOptions = fetchOptions;
     this.client.setFetchOptions(fetchOptions);
   }
+
+  disableErrorLogging() {
+    this.client.disableErrorLogging();
+  }
 }
 
 //      
@@ -5386,9 +5457,15 @@ class WebRTCClient extends Emitter {
 
   call(number        , enableVideo          , audioOnly          = false, conference          = false)          {
     logger.info('sdk webrtc creating call', { number, enableVideo, audioOnly });
-    const inviterOptions = {};
+    const inviterOptions         = {
+      sessionDescriptionHandlerOptionsReInvite: {
+        conference,
+        audioOnly,
+      },
+    };
+
     if (audioOnly) {
-      inviterOptions.sessionDescriptionHandlerModifiersReInvite = [deactivateVideoModifier];
+      inviterOptions.sessionDescriptionHandlerModifiersReInvite = [modifiers.stripVideo];
     }
 
     const session = new inviter.Inviter(this.userAgent, this._makeURI(number), inviterOptions);
@@ -5417,10 +5494,11 @@ class WebRTCClient extends Emitter {
       sessionDescriptionHandlerOptions: this.getMediaConfiguration(enableVideo || false, conference),
     };
 
-    inviteOptions.sessionDescriptionHandlerModifiers = [replaceLocalIpModifier];
+    inviteOptions.sessionDescriptionHandlerOptions.audioOnly = audioOnly;
 
+    inviteOptions.sessionDescriptionHandlerModifiers = [replaceLocalIpModifier];
     if (audioOnly) {
-      inviteOptions.sessionDescriptionHandlerModifiers.push(deactivateVideoModifier);
+      inviteOptions.sessionDescriptionHandlerModifiers.push(modifiers.stripVideo);
     }
 
     // Do not await invite here or we'll miss the Establishing state transition
@@ -5634,6 +5712,9 @@ class WebRTCClient extends Emitter {
     if (!this._isWeb()) {
       options.sessionDescriptionHandlerModifiers = [modifiers.holdModifier];
     }
+    options.sessionDescriptionHandlerOptions = {
+      constraints: options.constraints,
+    };
 
     // Send re-INVITE
     return session.invite(options);
@@ -5673,6 +5754,9 @@ class WebRTCClient extends Emitter {
       // (eg: holdModifier)
       options.sessionDescriptionHandlerModifiers = [];
     }
+    options.sessionDescriptionHandlerOptions = {
+      constraints: options.constraints,
+    };
 
     // Send re-INVITE
     return session.invite(options);
@@ -5902,7 +5986,8 @@ class WebRTCClient extends Emitter {
       ? this.video.deviceId.exact : undefined;
   }
 
-  reinvite(sipSession         , newConstraints          = null, conference          = false) {
+  reinvite(sipSession         , newConstraints          = null, conference          = false,
+    audioOnly          = false) {
     if (!sipSession) {
       return false;
     }
@@ -5912,16 +5997,17 @@ class WebRTCClient extends Emitter {
     }
 
     const wasMuted = this.isAudioMuted(sipSession);
-    // When upgrading to video, remove the `deactivateVideoModifier` modifiers
+    // When upgrading to video, remove the `stripVideo` modifiers
     if (newConstraints && newConstraints.video) {
-      const modifiers = sipSession.sessionDescriptionHandlerModifiersReInvite;
-      sipSession.sessionDescriptionHandlerModifiersReInvite = modifiers.filter(modifier =>
-        modifier !== deactivateVideoModifier);
+      const modifiers$1 = sipSession.sessionDescriptionHandlerModifiersReInvite;
+      sipSession.sessionDescriptionHandlerModifiersReInvite = modifiers$1.filter(modifier =>
+        modifier !== modifiers.stripVideo);
     }
 
     sipSession.sessionDescriptionHandlerOptionsReInvite = {
       ...sipSession.sessionDescriptionHandlerOptionsReInvite,
       conference,
+      audioOnly,
     };
 
     const shouldDoVideo = newConstraints ? newConstraints.video : this.sessionWantsToDoVideo(sipSession);
@@ -5961,6 +6047,8 @@ class WebRTCClient extends Emitter {
       },
       sessionDescriptionHandlerOptions: {
         constraints,
+        conference,
+        audioOnly,
         offerOptions: {
           iceRestart: false,
         },
@@ -6420,6 +6508,8 @@ class WebRTCClient extends Emitter {
 
   // Invitation and Inviter extends Session
   _setupSession(session         ) {
+    const sipSessionId = this.getSipSessionId(session);
+
     // When receiving an Invitation, the delegate is not defined.
     if (!session.delegate) {
       session.delegate = {};
@@ -6443,8 +6533,18 @@ class WebRTCClient extends Emitter {
       };
     };
 
+    const oldInviteRequest = session.onInviteRequest.bind(session);
+    let hadRemoteVideo = false;
+
+    // Monkey patch `onInviteRequest` to be able to know if there was a remote video stream before `onInvite` is called
+    // Becase when `onInvite` is called we already got the video track
+    session.onInviteRequest = (request) => {
+      hadRemoteVideo = this.hasARemoteVideoTrack(sipSessionId);
+
+      oldInviteRequest(request);
+    };
+
     session.delegate.onInvite = (request                        ) => {
-      const sipSessionId = this.getSipSessionId(session);
       let updatedCalleeName = null;
       let updatedNumber = null;
       if (session.assertedIdentity) {
@@ -6454,7 +6554,6 @@ class WebRTCClient extends Emitter {
       logger.info('re-invite received', { updatedCalleeName, updatedNumber });
 
       // Useful to know if it's a video upgrade or an unhold from a remote peer with a video stream
-      const hadRemoteVideo = this.hasARemoteVideoTrack(sipSessionId);
 
       // Update SDP
       // Remote video is handled by the `track` event. Here we're dealing with video stream removal.
@@ -6504,7 +6603,7 @@ class WebRTCClient extends Emitter {
   }
 
   _isAudioOnly(session         )          {
-    return session.sessionDescriptionHandlerModifiersReInvite.find(modifier => modifier === deactivateVideoModifier);
+    return session.sessionDescriptionHandlerModifiersReInvite.find(modifier => modifier === modifiers.stripVideo);
   }
 
   _setupMedias(session         , newStream              ) {

package/lib/websocket-client.js

@@ -310,7 +310,13 @@ class IssueReporter {
   }
 
   _isLevelAbove(level1        , level2        ) {
-    return LOG_LEVELS.indexOf(level1) > LOG_LEVELS.indexOf(level2);
+    const index1 = LOG_LEVELS.indexOf(level1);
+    const index2 = LOG_LEVELS.indexOf(level2);
+    if (index1 === -1 || index2 === -1) {
+      return false;
+    }
+
+    return index1 > index2;
   }
 
   _makeCategory(category        ) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wazo/sdk",
-  "version": "0.37.0-rc.5",
+  "version": "0.37.2",
   "description": "Wazo's JavaScript Software Development Kit.",
   "main": "dist/wazo-sdk.js",
   "author": "Wazo (http://wazo.io)",

package/src/api-client.js

@@ -157,4 +157,8 @@ export default class ApiClient {
     this.fetchOptions = fetchOptions;
     this.client.setFetchOptions(fetchOptions);
   }
+
+  disableErrorLogging() {
+    this.client.disableErrorLogging();
+  }
 }