@wazo/sdk 0.37.0-rc.5 → 0.37.2

package/lib/domain/Phone/CTIPhone.js

@@ -992,7 +992,7 @@ class Contact {
 
     return new Contact({
       sourceId: single.id || '',
-      name: single.displayName,
+      name: single.displayName || '',
       number: numbers.length ? numbers[0].number : '',
       numbers,
       emails,
@@ -1023,7 +1023,7 @@ class Contact {
 
     return new Contact({
       sourceId: single.id || '',
-      name: single.name,
+      name: single.name || '',
       number: numbers.length ? numbers[0].number : '',
       numbers,
       emails,
@@ -1124,7 +1124,7 @@ class Contact {
   }                   = {}) {
     this.id = id;
     this.uuid = uuid;
-    this.name = name;
+    this.name = name || '';
     this.number = number;
     this.numbers = numbers;
     this.email = email;
@@ -2008,7 +2008,7 @@ class CallSession {
     return newFrom(callSession, CallSession);
   }
 
-  static parseCall(session         , call      )              {
+  static parseCall(call      )              {
     return new CallSession({
       callId: call.id,
       sipCallId: call.sipCallId,
@@ -2061,17 +2061,66 @@ class Emitter {
 
 //      
 
+                                 
+                   
+                    
+                   
+                     
+               
+  
+
+                           
+                   
+             
+                   
+              
+               
+ 
+
+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;
+  }
+}
+
+//      
+
                         
-                 
+                  
                     
                          
                                 
                             
                    
-              
+               
              
                            
                       
+                                  
                               
                          
                 
@@ -2084,7 +2133,7 @@ class Emitter {
   
 
                          
-               
+                
                     
                           
                         
@@ -2099,13 +2148,14 @@ class Emitter {
              
                    
               
-            
+             
+                          
   
 
 class CallLog {
                
 
-               
+                
                     
                          
                         
@@ -2122,7 +2172,7 @@ class CallLog {
              
                    
               
-            
+             
 
   static merge(current                , toMerge                )                  {
     const onlyUnique = (value, index, self) => self.indexOf(value) === index;
@@ -2139,7 +2189,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: {
@@ -2153,13 +2203,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: {
@@ -2173,7 +2224,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,
@@ -2633,7 +2685,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        ) {
@@ -2691,6 +2749,7 @@ class ApiRequester {
                        
                                  
                                      
+                           
 
                  
                 
@@ -2730,6 +2789,8 @@ class ApiRequester {
       this.token = token;
     }
 
+    this.shouldLogErrors = true;
+
     methods.forEach(method => {
       // $FlowFixMe
       ApiRequester.prototype[method] = function sugar(...args) {
@@ -2753,6 +2814,14 @@ class ApiRequester {
     this.fetchOptions = options;
   }
 
+  disableErrorLogging() {
+    this.shouldLogErrors = false;
+  }
+
+  enableErrorLogging() {
+    this.shouldLogErrors = true;
+  }
+
   async call(
     path        ,
     method         = 'get',
@@ -2813,7 +2882,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;
         });
@@ -2821,7 +2892,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;
     });
@@ -4681,6 +4754,10 @@ class ApiClient {
     this.fetchOptions = fetchOptions;
     this.client.setFetchOptions(fetchOptions);
   }
+
+  disableErrorLogging() {
+    this.client.disableErrorLogging();
+  }
 }
 
 /* eslint-disable dot-notation */
@@ -4913,7 +4990,7 @@ class CTIPhone extends Emitter                  {
     if (!this.currentCall) {
       return null;
     }
-    const callSession = CallSession.parseCall(this.session, this.currentCall);
+    const callSession = CallSession.parseCall(this.currentCall);
     this.eventEmitter.emit('onCallOutgoing', callSession);
 
     return callSession;
@@ -5097,6 +5174,10 @@ class CTIPhone extends Emitter                  {
     return null;
   }
 
+  getLocalVideoStream()               {
+    return null;
+  }
+
   setActiveSipSession() {}
 
   isRegistered()          {
@@ -5112,7 +5193,7 @@ class CTIPhone extends Emitter                  {
   }
 
   getCurrentCallSession()               {
-    return this.currentCall ? CallSession.parseCall(this.session, this.currentCall) : null;
+    return this.currentCall ? CallSession.parseCall(this.currentCall) : null;
   }
 
   enableRinging() {}

package/lib/domain/Phone/Phone.js

@@ -2,20 +2,4 @@
 
 require('sip.js/lib/api/session-state');
 require('moment');
-var jsrsasign = require('jsrsasign');
 
-//      
-
-const swarmPublicKey  = `-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmkXOuNfY8u5xoTiIhkb8
-djnbIwG/Wrz3vpo8BZir8L5e1a1nSy740qBjP7ZINBQoALDhFfmdOfJnCyEGiHuz
-ZW6jbG6C3PryE3Bu6GKwqSmD6k3q4Zk27fpwYAnNl+rWhYYM563rJZBda/INyHNN
-pK7M1mixWi7gNdjjXwoEXSSBx+VpYMkY6LiAB2mvHXTY9M1qI14dvgGoQISZQoKi
-NMTRCg5UP2ic0Dd9nSz/XpcOxGfa+0fwIl1F7RC1tJXOqvkGGPTOV4LLfg/Yta3h
-nUPX9EZZDIX6vO/0IBV1LzjSl2A1bYFYAjJfowv3i1CpvONBOClHjSY5t9Y8MH6p
-BwIDAQAB
------END PUBLIC KEY-----`;
-
-//      
-
-jsrsasign.KEYUTIL.getKey(swarmPublicKey);

package/lib/domain/Phone/WebRTCPhone.js

@@ -5,10 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var invitation = require('sip.js/lib/api/invitation');
 var sessionState = require('sip.js/lib/api/session-state');
 var moment = require('moment');
-var jsrsasign = require('jsrsasign');
 require('webrtc-adapter');
 require('sip.js/lib/api/user-agent-state');
-require('sip.js/lib/api/message');
 require('sip.js/lib/core/messages/parser');
 require('sip.js/lib/core/messages/methods/constants');
 require('sip.js/lib/grammar/uri');
@@ -26,6 +24,7 @@ require('sip.js/lib/platform/web/session-description-handler/session-description
 require('sip.js/lib/platform/web/session-description-handler/session-description-handler-options');
 require('js-base64');
 require('sdp-transform');
+var jsrsasign = require('jsrsasign');
 require('json-to-graphql-query/lib/jsonToGraphQLQuery');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -44,22 +43,6 @@ var newFrom = (instance     , ToClass     ) => {
   return new ToClass(args);
 };
 
-//      
-
-const swarmPublicKey  = `-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmkXOuNfY8u5xoTiIhkb8
-djnbIwG/Wrz3vpo8BZir8L5e1a1nSy740qBjP7ZINBQoALDhFfmdOfJnCyEGiHuz
-ZW6jbG6C3PryE3Bu6GKwqSmD6k3q4Zk27fpwYAnNl+rWhYYM563rJZBda/INyHNN
-pK7M1mixWi7gNdjjXwoEXSSBx+VpYMkY6LiAB2mvHXTY9M1qI14dvgGoQISZQoKi
-NMTRCg5UP2ic0Dd9nSz/XpcOxGfa+0fwIl1F7RC1tJXOqvkGGPTOV4LLfg/Yta3h
-nUPX9EZZDIX6vO/0IBV1LzjSl2A1bYFYAjJfowv3i1CpvONBOClHjSY5t9Y8MH6p
-BwIDAQAB
------END PUBLIC KEY-----`;
-
-//      
-
-jsrsasign.KEYUTIL.getKey(swarmPublicKey);
-
 //      
 /* eslint-disable no-param-reassign */
 
@@ -383,7 +366,7 @@ class CallSession {
     return newFrom(callSession, CallSession);
   }
 
-  static parseCall(session         , call      )              {
+  static parseCall(call      )              {
     return new CallSession({
       callId: call.id,
       sipCallId: call.sipCallId,
@@ -679,7 +662,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        ) {
@@ -738,6 +727,22 @@ class Emitter {
   }
 }
 
+//      
+
+const swarmPublicKey  = `-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmkXOuNfY8u5xoTiIhkb8
+djnbIwG/Wrz3vpo8BZir8L5e1a1nSy740qBjP7ZINBQoALDhFfmdOfJnCyEGiHuz
+ZW6jbG6C3PryE3Bu6GKwqSmD6k3q4Zk27fpwYAnNl+rWhYYM563rJZBda/INyHNN
+pK7M1mixWi7gNdjjXwoEXSSBx+VpYMkY6LiAB2mvHXTY9M1qI14dvgGoQISZQoKi
+NMTRCg5UP2ic0Dd9nSz/XpcOxGfa+0fwIl1F7RC1tJXOqvkGGPTOV4LLfg/Yta3h
+nUPX9EZZDIX6vO/0IBV1LzjSl2A1bYFYAjJfowv3i1CpvONBOClHjSY5t9Y8MH6p
+BwIDAQAB
+-----END PUBLIC KEY-----`;
+
+//      
+
+jsrsasign.KEYUTIL.getKey(swarmPublicKey);
+
 /* eslint-disable dot-notation */
 
 // Can't use node cache mechanism here because when requiring lib/CallApi.js
@@ -945,9 +950,14 @@ class WebRTCPhone extends Emitter                  {
     return true;
   }
 
-  async sendReinvite(callSession              , constraints          = null, conference          = false) {
+  async sendReinvite(callSession              , constraints          = null, conference          = false,
+    audioOnly          = false) {
     const sipSession = this.findSipSession(callSession);
-    logger.info('WebRTC phone - send reinvite', { sessionId: sipSession ? sipSession.id : null, constraints });
+    logger.info('WebRTC phone - send reinvite', {
+      sessionId: sipSession ? sipSession.id : null,
+      constraints,
+      audioOnly,
+    });
 
     if (!sipSession) {
       return null;
@@ -973,7 +983,7 @@ class WebRTCPhone extends Emitter                  {
     // Force reinvite in SDH
     sipSession.sessionDescriptionHandler.localMediaStreamConstraints = null;
 
-    return this.client.reinvite(sipSession, constraints, conference);
+    return this.client.reinvite(sipSession, constraints, conference, audioOnly);
   }
 
   getUserAgent() {
@@ -1049,9 +1059,9 @@ class WebRTCPhone extends Emitter                  {
     }
 
     // Release local video stream when downgrading to audio
-    const localVideoStream = sipSession.sessionDescriptionHandler.localMediaStream;
+    const localStream = sipSession.sessionDescriptionHandler.localMediaStream;
     const pc = sipSession.sessionDescriptionHandler.peerConnection;
-    const videoTracks = localVideoStream.getVideoTracks();
+    const videoTracks = localStream.getVideoTracks();
 
     // Remove video senders
     pc.getSenders().filter(sender => sender.track && sender.track.kind === 'video').forEach(videoSender => {
@@ -1066,7 +1076,7 @@ class WebRTCPhone extends Emitter                  {
     videoTracks.forEach(videoTrack => {
       videoTrack.enabled = false;
       videoTrack.stop();
-      localVideoStream.removeTrack(videoTrack);
+      localStream.removeTrack(videoTrack);
     });
 
     this._sendReinviteMessage(callSession, false);
@@ -1083,12 +1093,14 @@ class WebRTCPhone extends Emitter                  {
 
     const pc = sipSession.sessionDescriptionHandler.peerConnection;
     const shouldScreenShare = constraints && constraints.screen;
+    const options = sipSession.sessionDescriptionHandlerOptionsReInvite;
+    const wasAudioOnly = options && options.audioOnly;
 
     // Check if a video sender already exists
     let videoSender;
     if (isConference) {
       const trans = pc.getTransceivers().find(transceiver => transceiver.mid === '1');
-      videoSender = trans.sender;
+      videoSender = trans ? trans.sender : null;
     } else {
       videoSender = pc.getSenders().find(sender => sender.track === null);
     }
@@ -1125,6 +1137,11 @@ class WebRTCPhone extends Emitter                  {
       this._onScreenSharing(newStream, sipSession, callSession, false);
     }
 
+    // We have to reinvite to change the direction on the bundle when upgrading from an audioOnly conference
+    if (isConference && wasAudioOnly) {
+      return true;
+    }
+
     // No reinvite needed here
     return false;
   }
@@ -1209,7 +1226,7 @@ class WebRTCPhone extends Emitter                  {
         event.track.enabled = false;
       }
 
-      return this.eventEmitter.emit(ON_VIDEO_STREAM, stream, event.track.id, event);
+      return this.eventEmitter.emit(ON_VIDEO_STREAM, stream, event.track.id, event, sipSession);
     };
 
     peerConnection.onremovestream = event => {
@@ -1265,14 +1282,11 @@ class WebRTCPhone extends Emitter                  {
         const targetCallSession = callSession || this.currentCallSession;
         const conference = this.isConference(targetCallSession);
 
-        if (this.currentScreenShare.sender && this.currentScreenShare.hadVideo) {
-          // When stopping screenshare and we had video before that, we have to re-upgrade
-          await this.sendReinvite(targetCallSession, { audio: false, video: true }, conference);
-        } else {
-          // When upgrading directly to screenshare (eg: we don't have a videoLocalStream to replace)
-          // We have to downgrade to audio.
-          await this.sendReinvite(targetCallSession, { audio: false, video: false }, conference);
-        }
+        // When stopping screenshare and we had video before that, we have to re-upgrade
+        // When upgrading directly to screenshare (eg: we don't have a videoLocalStream to replace)
+        // We have to downgrade to audio.
+        const screenshareStopped = this.currentScreenShare.sender && this.currentScreenShare.hadVideo;
+        await this.sendReinvite(targetCallSession, { audio: false, video: screenshareStopped }, conference);
       }
     } catch (e) {
       console.warn(e);
@@ -1609,6 +1623,7 @@ class WebRTCPhone extends Emitter                  {
     }
   }
 
+  // @Deprecated
   unhold(callSession             , withEvent          = true, isConference          = false)       {
     logger.info('WebRTC unhold', { id: callSession ? callSession.getId() : null });
 

package/lib/domain/Recording.js

@@ -0,0 +1,57 @@
+'use strict';
+
+var moment = require('moment');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
+
+//      
+
+                                 
+                   
+                    
+                   
+                     
+               
+  
+
+                           
+                   
+             
+                   
+              
+               
+ 
+
+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;
+  }
+}
+
+module.exports = Recording;

package/lib/domain/Room.js

@@ -2,7 +2,6 @@
 
 require('sip.js/lib/api/session-state');
 require('moment');
-var jsrsasign = require('jsrsasign');
 
 //      
 
@@ -15,22 +14,6 @@ var newFrom = (instance     , ToClass     ) => {
   return new ToClass(args);
 };
 
-//      
-
-const swarmPublicKey  = `-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmkXOuNfY8u5xoTiIhkb8
-djnbIwG/Wrz3vpo8BZir8L5e1a1nSy740qBjP7ZINBQoALDhFfmdOfJnCyEGiHuz
-ZW6jbG6C3PryE3Bu6GKwqSmD6k3q4Zk27fpwYAnNl+rWhYYM563rJZBda/INyHNN
-pK7M1mixWi7gNdjjXwoEXSSBx+VpYMkY6LiAB2mvHXTY9M1qI14dvgGoQISZQoKi
-NMTRCg5UP2ic0Dd9nSz/XpcOxGfa+0fwIl1F7RC1tJXOqvkGGPTOV4LLfg/Yta3h
-nUPX9EZZDIX6vO/0IBV1LzjSl2A1bYFYAjJfowv3i1CpvONBOClHjSY5t9Y8MH6p
-BwIDAQAB
------END PUBLIC KEY-----`;
-
-//      
-
-jsrsasign.KEYUTIL.getKey(swarmPublicKey);
-
 //      
 /* eslint-disable no-param-reassign */
 

package/lib/domain/SwitchboardCall.js

@@ -2,7 +2,6 @@
 
 require('sip.js/lib/api/session-state');
 require('moment');
-var jsrsasign = require('jsrsasign');
 
 //      
 
@@ -15,22 +14,6 @@ var newFrom = (instance     , ToClass     ) => {
   return new ToClass(args);
 };
 
-//      
-
-const swarmPublicKey  = `-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmkXOuNfY8u5xoTiIhkb8
-djnbIwG/Wrz3vpo8BZir8L5e1a1nSy740qBjP7ZINBQoALDhFfmdOfJnCyEGiHuz
-ZW6jbG6C3PryE3Bu6GKwqSmD6k3q4Zk27fpwYAnNl+rWhYYM563rJZBda/INyHNN
-pK7M1mixWi7gNdjjXwoEXSSBx+VpYMkY6LiAB2mvHXTY9M1qI14dvgGoQISZQoKi
-NMTRCg5UP2ic0Dd9nSz/XpcOxGfa+0fwIl1F7RC1tJXOqvkGGPTOV4LLfg/Yta3h
-nUPX9EZZDIX6vO/0IBV1LzjSl2A1bYFYAjJfowv3i1CpvONBOClHjSY5t9Y8MH6p
-BwIDAQAB
------END PUBLIC KEY-----`;
-
-//      
-
-jsrsasign.KEYUTIL.getKey(swarmPublicKey);
-
 //      
 /* eslint-disable no-param-reassign */