@wazo/sdk 0.37.0-rc.5 → 0.37.2

package/lib/lib/WazoSessionDescriptionHandler.js

@@ -286,7 +286,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        ) {
@@ -415,6 +421,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
@@ -441,16 +448,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 => {
@@ -573,7 +580,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.'));
     }
@@ -588,14 +596,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':
@@ -611,7 +622,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;
@@ -670,6 +681,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;
@@ -708,8 +726,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`);

package/lib/service/CallApi.js

@@ -1179,7 +1179,7 @@ class Contact {
 
     return new Contact({
       sourceId: single.id || '',
-      name: single.displayName,
+      name: single.displayName || '',
       number: numbers.length ? numbers[0].number : '',
       numbers,
       emails,
@@ -1210,7 +1210,7 @@ class Contact {
 
     return new Contact({
       sourceId: single.id || '',
-      name: single.name,
+      name: single.name || '',
       number: numbers.length ? numbers[0].number : '',
       numbers,
       emails,
@@ -1311,7 +1311,7 @@ class Contact {
   }                   = {}) {
     this.id = id;
     this.uuid = uuid;
-    this.name = name;
+    this.name = name || '';
     this.number = number;
     this.numbers = numbers;
     this.email = email;
@@ -1684,17 +1684,66 @@ class Session {
 
 //      
 
+                                 
+                   
+                    
+                   
+                     
+               
+  
+
+                           
+                   
+             
+                   
+              
+               
+ 
+
+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;
+  }
+}
+
+//      
+
                         
-                 
+                  
                     
                          
                                 
                             
                    
-              
+               
              
                            
                       
+                                  
                               
                          
                 
@@ -1707,7 +1756,7 @@ class Session {
   
 
                          
-               
+                
                     
                           
                         
@@ -1722,13 +1771,14 @@ class Session {
              
                    
               
-            
+             
+                          
   
 
 class CallLog {
                
 
-               
+                
                     
                          
                         
@@ -1745,7 +1795,7 @@ class CallLog {
              
                    
               
-            
+             
 
   static merge(current                , toMerge                )                  {
     const onlyUnique = (value, index, self) => self.indexOf(value) === index;
@@ -1762,7 +1812,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: {
@@ -1776,13 +1826,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: {
@@ -1796,7 +1847,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,
@@ -2272,7 +2324,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        ) {
@@ -2330,6 +2388,7 @@ class ApiRequester {
                        
                                  
                                      
+                           
 
                  
                 
@@ -2369,6 +2428,8 @@ class ApiRequester {
       this.token = token;
     }
 
+    this.shouldLogErrors = true;
+
     methods.forEach(method => {
       // $FlowFixMe
       ApiRequester.prototype[method] = function sugar(...args) {
@@ -2392,6 +2453,14 @@ class ApiRequester {
     this.fetchOptions = options;
   }
 
+  disableErrorLogging() {
+    this.shouldLogErrors = false;
+  }
+
+  enableErrorLogging() {
+    this.shouldLogErrors = true;
+  }
+
   async call(
     path        ,
     method         = 'get',
@@ -2452,7 +2521,9 @@ class ApiRequester {
             ? exceptionClass.fromText(err, response.status)
             : exceptionClass.fromResponse(err, response.status);
 
-          logger$1.error('API error', error);
+          if (this.shouldLogErrors) {
+            logger$1.error('API error', error);
+          }
 
           throw error;
         });
@@ -2460,7 +2531,9 @@ class ApiRequester {
 
       return newParse(response, isJson);
     }).catch(error => {
-      logger$1.error('Fetch failed', { url, options, message: error.message, stack: error.stack });
+      if (this.shouldLogErrors) {
+        logger$1.error('Fetch failed', { url, options, message: error.message, stack: error.stack });
+      }
 
       throw error;
     });
@@ -4327,6 +4400,10 @@ class ApiClient {
     this.fetchOptions = fetchOptions;
     this.client.setFetchOptions(fetchOptions);
   }
+
+  disableErrorLogging() {
+    this.client.disableErrorLogging();
+  }
 }
 
 /* eslint-disable dot-notation */

package/lib/service/IssueReporter.js

@@ -278,7 +278,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/lib/service/__tests__/IssueReporter.test.js

@@ -278,7 +278,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        ) {
@@ -292,11 +298,22 @@ var IssueReporter$1 = new IssueReporter();
 
 jest.mock('../../utils/api-requester');
 
-IssueReporter$1.enable();
+let oldLog;
+let oldError;
 
 class MyError extends Error {}
 
 describe('IssueReporter', () => {
+  beforeAll(() => {
+    oldLog = console.log;
+    oldError = console.error;
+
+    console.log = () => {};
+    console.error = () => {};
+
+    IssueReporter$1.enable();
+  });
+
   beforeEach(() => {
     jest.resetAllMocks();
 
@@ -305,12 +322,19 @@ describe('IssueReporter', () => {
     }));
   });
 
+  afterAll(() => {
+    console.log = oldLog;
+    console.error = oldError;
+  });
+
   it('should compute level order', () => {
     expect(IssueReporter$1._isLevelAbove('info', 'trace')).toBeTruthy();
     expect(IssueReporter$1._isLevelAbove('trace', 'warn')).toBeFalsy();
     expect(IssueReporter$1._isLevelAbove('error', 'warn')).toBeTruthy();
     expect(IssueReporter$1._isLevelAbove('info', 'warn')).toBeFalsy();
     expect(IssueReporter$1._isLevelAbove('trace', 'trace')).toBeFalsy();
+    expect(IssueReporter$1._isLevelAbove('trace', 'something')).toBeFalsy();
+    expect(IssueReporter$1._isLevelAbove('something', 'trace')).toBeFalsy();
   });
 
   it('should send if verbosity is higher than required', () => {

package/lib/service/getApiClient.js

@@ -317,7 +317,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        ) {
@@ -375,6 +381,7 @@ class ApiRequester {
                        
                                  
                                      
+                           
 
                  
                 
@@ -414,6 +421,8 @@ class ApiRequester {
       this.token = token;
     }
 
+    this.shouldLogErrors = true;
+
     methods.forEach(method => {
       // $FlowFixMe
       ApiRequester.prototype[method] = function sugar(...args) {
@@ -437,6 +446,14 @@ class ApiRequester {
     this.fetchOptions = options;
   }
 
+  disableErrorLogging() {
+    this.shouldLogErrors = false;
+  }
+
+  enableErrorLogging() {
+    this.shouldLogErrors = true;
+  }
+
   async call(
     path        ,
     method         = 'get',
@@ -497,7 +514,9 @@ class ApiRequester {
             ? exceptionClass.fromText(err, response.status)
             : exceptionClass.fromResponse(err, response.status);
 
-          logger$1.error('API error', error);
+          if (this.shouldLogErrors) {
+            logger$1.error('API error', error);
+          }
 
           throw error;
         });
@@ -505,7 +524,9 @@ class ApiRequester {
 
       return newParse(response, isJson);
     }).catch(error => {
-      logger$1.error('Fetch failed', { url, options, message: error.message, stack: error.stack });
+      if (this.shouldLogErrors) {
+        logger$1.error('Fetch failed', { url, options, message: error.message, stack: error.stack });
+      }
 
       throw error;
     });
@@ -1555,7 +1576,7 @@ class Contact {
 
     return new Contact({
       sourceId: single.id || '',
-      name: single.displayName,
+      name: single.displayName || '',
       number: numbers.length ? numbers[0].number : '',
       numbers,
       emails,
@@ -1586,7 +1607,7 @@ class Contact {
 
     return new Contact({
       sourceId: single.id || '',
-      name: single.name,
+      name: single.name || '',
       number: numbers.length ? numbers[0].number : '',
       numbers,
       emails,
@@ -1687,7 +1708,7 @@ class Contact {
   }                   = {}) {
     this.id = id;
     this.uuid = uuid;
-    this.name = name;
+    this.name = name || '';
     this.number = number;
     this.numbers = numbers;
     this.email = email;
@@ -2996,17 +3017,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;
+  }
+}
+
+//      
+
                         
-                 
+                  
                     
                          
                                 
                             
                    
-              
+               
              
                            
                       
+                                  
                               
                          
                 
@@ -3019,7 +3089,7 @@ var updateFrom = (instance     , from     ) => {
   
 
                          
-               
+                
                     
                           
                         
@@ -3034,13 +3104,14 @@ var updateFrom = (instance     , from     ) => {
              
                    
               
-            
+             
+                          
   
 
 class CallLog {
                
 
-               
+                
                     
                          
                         
@@ -3057,7 +3128,7 @@ class CallLog {
              
                    
               
-            
+             
 
   static merge(current                , toMerge                )                  {
     const onlyUnique = (value, index, self) => self.indexOf(value) === index;
@@ -3074,7 +3145,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: {
@@ -3088,13 +3159,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: {
@@ -3108,7 +3180,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,
@@ -4329,6 +4402,10 @@ class ApiClient {
     this.fetchOptions = fetchOptions;
     this.client.setFetchOptions(fetchOptions);
   }
+
+  disableErrorLogging() {
+    this.client.disableErrorLogging();
+  }
 }
 
 /* eslint-disable dot-notation */