@wazo/sdk 0.37.0-rc.5 → 0.37.2

package/esm/domain/Phone/CTIPhone.js

@@ -983,7 +983,7 @@ class Contact {
 
     return new Contact({
       sourceId: single.id || '',
-      name: single.displayName,
+      name: single.displayName || '',
       number: numbers.length ? numbers[0].number : '',
       numbers,
       emails,
@@ -1014,7 +1014,7 @@ class Contact {
 
     return new Contact({
       sourceId: single.id || '',
-      name: single.name,
+      name: single.name || '',
       number: numbers.length ? numbers[0].number : '',
       numbers,
       emails,
@@ -1115,7 +1115,7 @@ class Contact {
   }                   = {}) {
     this.id = id;
     this.uuid = uuid;
-    this.name = name;
+    this.name = name || '';
     this.number = number;
     this.numbers = numbers;
     this.email = email;
@@ -1999,7 +1999,7 @@ class CallSession {
     return newFrom(callSession, CallSession);
   }
 
-  static parseCall(session         , call      )              {
+  static parseCall(call      )              {
     return new CallSession({
       callId: call.id,
       sipCallId: call.sipCallId,
@@ -2052,17 +2052,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(plain.end_time).toDate() : null,
+      start: moment(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;
+  }
+}
+
+//      
+
                         
-                 
+                  
                     
                          
                                 
                             
                    
-              
+               
              
                            
                       
+                                  
                               
                          
                 
@@ -2075,7 +2124,7 @@ class Emitter {
   
 
                          
-               
+                
                     
                           
                         
@@ -2090,13 +2139,14 @@ class Emitter {
              
                    
               
-            
+             
+                          
   
 
 class CallLog {
                
 
-               
+                
                     
                          
                         
@@ -2113,7 +2163,7 @@ class CallLog {
              
                    
               
-            
+             
 
   static merge(current                , toMerge                )                  {
     const onlyUnique = (value, index, self) => self.indexOf(value) === index;
@@ -2130,7 +2180,7 @@ class CallLog {
 
   static parse(plain                 )          {
     return new CallLog({
-      answer: moment(plain.answer).toDate(),
+      answer: plain.answer ? moment(plain.answer).toDate() : null,
       answered: plain.answered,
       callDirection: plain.call_direction,
       destination: {
@@ -2144,13 +2194,14 @@ class CallLog {
       id: plain.id,
       duration: (plain.duration || 0) * 1000, // duration is in seconds
       start: moment(plain.start).toDate(),
-      end: moment(plain.end).toDate(),
+      end: plain.end ? moment(plain.end).toDate() : null,
+      recordings: Recording.parseMany(plain.recordings),
     });
   }
 
   static parseNew(plain                 , session         )          {
     return new CallLog({
-      answer: moment(plain.answer).toDate(),
+      answer: plain.answer ? moment(plain.answer).toDate() : null,
       answered: plain.answered,
       callDirection: plain.call_direction,
       destination: {
@@ -2164,7 +2215,8 @@ class CallLog {
       id: plain.id,
       duration: (plain.duration || 0) * 1000, // duration is in seconds
       start: moment(plain.start).toDate(),
-      end: moment(plain.end).toDate(),
+      end: plain.end ? moment(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,
@@ -2624,7 +2676,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        ) {
@@ -2682,6 +2740,7 @@ class ApiRequester {
                        
                                  
                                      
+                           
 
                  
                 
@@ -2721,6 +2780,8 @@ class ApiRequester {
       this.token = token;
     }
 
+    this.shouldLogErrors = true;
+
     methods.forEach(method => {
       // $FlowFixMe
       ApiRequester.prototype[method] = function sugar(...args) {
@@ -2744,6 +2805,14 @@ class ApiRequester {
     this.fetchOptions = options;
   }
 
+  disableErrorLogging() {
+    this.shouldLogErrors = false;
+  }
+
+  enableErrorLogging() {
+    this.shouldLogErrors = true;
+  }
+
   async call(
     path        ,
     method         = 'get',
@@ -2804,7 +2873,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;
         });
@@ -2812,7 +2883,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;
     });
@@ -4672,6 +4745,10 @@ class ApiClient {
     this.fetchOptions = fetchOptions;
     this.client.setFetchOptions(fetchOptions);
   }
+
+  disableErrorLogging() {
+    this.client.disableErrorLogging();
+  }
 }
 
 /* eslint-disable dot-notation */
@@ -4904,7 +4981,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;
@@ -5088,6 +5165,10 @@ class CTIPhone extends Emitter                  {
     return null;
   }
 
+  getLocalVideoStream()               {
+    return null;
+  }
+
   setActiveSipSession() {}
 
   isRegistered()          {
@@ -5103,7 +5184,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/esm/domain/Phone/Phone.js

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

package/esm/domain/Phone/WebRTCPhone.js

@@ -1,10 +1,8 @@
 import { Invitation } from 'sip.js/lib/api/invitation';
 import { SessionState } from 'sip.js/lib/api/session-state';
 import moment from 'moment';
-import { KEYUTIL } from 'jsrsasign';
 import 'webrtc-adapter';
 import 'sip.js/lib/api/user-agent-state';
-import 'sip.js/lib/api/message';
 import 'sip.js/lib/core/messages/parser';
 import 'sip.js/lib/core/messages/methods/constants';
 import 'sip.js/lib/grammar/uri';
@@ -22,6 +20,7 @@ import 'sip.js/lib/platform/web/session-description-handler/session-description-
 import 'sip.js/lib/platform/web/session-description-handler/session-description-handler-options';
 import 'js-base64';
 import 'sdp-transform';
+import { KEYUTIL } from 'jsrsasign';
 import 'json-to-graphql-query/lib/jsonToGraphQLQuery';
 
 //      
@@ -35,22 +34,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-----`;
-
-//      
-
-KEYUTIL.getKey(swarmPublicKey);
-
 //      
 /* eslint-disable no-param-reassign */
 
@@ -374,7 +357,7 @@ class CallSession {
     return newFrom(callSession, CallSession);
   }
 
-  static parseCall(session         , call      )              {
+  static parseCall(call      )              {
     return new CallSession({
       callId: call.id,
       sipCallId: call.sipCallId,
@@ -670,7 +653,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        ) {
@@ -729,6 +718,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-----`;
+
+//      
+
+KEYUTIL.getKey(swarmPublicKey);
+
 /* eslint-disable dot-notation */
 
 // Can't use node cache mechanism here because when requiring lib/CallApi.js
@@ -936,9 +941,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;
@@ -964,7 +974,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() {
@@ -1040,9 +1050,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 => {
@@ -1057,7 +1067,7 @@ class WebRTCPhone extends Emitter                  {
     videoTracks.forEach(videoTrack => {
       videoTrack.enabled = false;
       videoTrack.stop();
-      localVideoStream.removeTrack(videoTrack);
+      localStream.removeTrack(videoTrack);
     });
 
     this._sendReinviteMessage(callSession, false);
@@ -1074,12 +1084,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);
     }
@@ -1116,6 +1128,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;
   }
@@ -1200,7 +1217,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 => {
@@ -1256,14 +1273,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);
@@ -1600,6 +1614,7 @@ class WebRTCPhone extends Emitter                  {
     }
   }
 
+  // @Deprecated
   unhold(callSession             , withEvent          = true, isConference          = false)       {
     logger.info('WebRTC unhold', { id: callSession ? callSession.getId() : null });
 

package/esm/domain/Recording.js

@@ -0,0 +1,51 @@
+import moment from '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(plain.end_time).toDate() : null,
+      start: moment(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;
+  }
+}
+
+export default Recording;

package/esm/domain/Room.js

@@ -1,6 +1,5 @@
 import 'sip.js/lib/api/session-state';
 import 'moment';
-import { KEYUTIL } from 'jsrsasign';
 
 //      
 
@@ -13,22 +12,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-----`;
-
-//      
-
-KEYUTIL.getKey(swarmPublicKey);
-
 //      
 /* eslint-disable no-param-reassign */
 

package/esm/domain/SwitchboardCall.js

@@ -1,6 +1,5 @@
 import 'sip.js/lib/api/session-state';
 import 'moment';
-import { KEYUTIL } from 'jsrsasign';
 
 //      
 
@@ -13,22 +12,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-----`;
-
-//      
-
-KEYUTIL.getKey(swarmPublicKey);
-
 //      
 /* eslint-disable no-param-reassign */