@wazo/sdk 0.37.0 → 0.37.4

package/lib/domain/Phone/WebRTCPhone.js

@@ -5,7 +5,6 @@ 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/core/messages/parser');
@@ -25,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 }; }
@@ -43,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 */
 
@@ -382,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,
@@ -678,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        ) {
@@ -737,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
@@ -954,7 +960,7 @@ class WebRTCPhone extends Emitter                  {
     });
 
     if (!sipSession) {
-      return null;
+      return false;
     }
 
     // $FlowFixMe
@@ -964,19 +970,17 @@ class WebRTCPhone extends Emitter                  {
     // Downgrade
     if (constraints && !isUpgrade) {
       // No reinvite needed
-      return this._downgradeToAudio(callSession);
+      this._downgradeToAudio(callSession);
+      return false;
     }
 
     if (isUpgrade) {
       const shouldReinvite = await this._upgradeToVideo(callSession, constraints, conference);
       if (!shouldReinvite) {
-        return;
+        return false;
       }
     }
 
-    // Force reinvite in SDH
-    sipSession.sessionDescriptionHandler.localMediaStreamConstraints = null;
-
     return this.client.reinvite(sipSession, constraints, conference, audioOnly);
   }
 
@@ -1049,7 +1053,7 @@ class WebRTCPhone extends Emitter                  {
   _downgradeToAudio(callSession              ) {
     const sipSession = this.findSipSession(callSession);
     if (!sipSession) {
-      return;
+      return false;
     }
 
     // Release local video stream when downgrading to audio
@@ -1251,6 +1255,10 @@ class WebRTCPhone extends Emitter                  {
       localStream.removeTrack(videoTrack);
     }
 
+    if (localStream) {
+      localStream.addTrack(screenTrack);
+    }
+
     if (sender) {
       sender.replaceTrack(screenTrack);
     }
@@ -1266,6 +1274,7 @@ class WebRTCPhone extends Emitter                  {
     }
 
     logger.info('WebRTC phone - stop screen sharing');
+    let reinvited = false;
 
     try {
       if (this.currentScreenShare.stream) {
@@ -1280,7 +1289,8 @@ class WebRTCPhone extends Emitter                  {
         // 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);
+        const constraints = { audio: false, video: screenshareStopped };
+        reinvited = await this.sendReinvite(targetCallSession, constraints, conference);
       }
     } catch (e) {
       console.warn(e);
@@ -1294,6 +1304,8 @@ class WebRTCPhone extends Emitter                  {
     );
 
     this.currentScreenShare = null;
+
+    return reinvited;
   }
 
   async _getStreamFromConstraints(constraints        , conference          = false)                        {
@@ -1354,6 +1366,10 @@ class WebRTCPhone extends Emitter                  {
     this.client.changeAudioOutputDevice(id);
   }
 
+  createAudioElementFor(sessionId        ) {
+    return this.client.createAudioElementFor(sessionId);
+  }
+
   changeRingDevice(id        ) {
     this.audioRingDeviceId = id;
   }
@@ -2001,6 +2017,10 @@ class WebRTCPhone extends Emitter                  {
     return callSession ? this.client.hasLocalVideo(callSession.sipCallId) : null;
   }
 
+  hasALocalVideoTrack(callSession             ) {
+    return callSession ? this.client.hasALocalVideoTrack(callSession.sipCallId) : null;
+  }
+
   getRemoteStream(callSession             )               {
     return callSession ? this.client.getRemoteStream(callSession.sipCallId) : null;
   }

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 */
 

package/lib/domain/__tests__/CallLog.test.js

@@ -168,7 +168,11 @@ class CallLog {
       answered: plain.answered,
       callDirection: plain.call_direction,
       destination: {
-        extension: plain.requested_extension || plain.destination_extension,
+        // @TEMP: Temporarily assuming empty numbers are meetings
+        // which is admittedly a very dangerous assumption. Did i mention it was temporary?
+        extension: plain.requested_extension
+          || plain.destination_extension
+          || `meeting-${plain.requested_name || plain.destination_name || ''}`,
         name: plain.requested_name || plain.destination_name || '',
       },
       source: {
@@ -184,27 +188,11 @@ class CallLog {
   }
 
   static parseNew(plain                 , session         )          {
-    return new CallLog({
-      answer: plain.answer ? moment__default['default'](plain.answer).toDate() : null,
-      answered: plain.answered,
-      callDirection: plain.call_direction,
-      destination: {
-        extension: plain.requested_extension || plain.destination_extension,
-        name: plain.requested_name || plain.destination_name || '',
-      },
-      source: {
-        extension: plain.source_extension,
-        name: plain.source_name,
-      },
-      id: plain.id,
-      duration: (plain.duration || 0) * 1000, // duration is in seconds
-      start: moment__default['default'](plain.start).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,
-    });
+    const callLog          = CallLog.parse(plain);
+    // @TODO: FIXME add verification declined vs missed call
+    callLog.newMissedCall = session
+      && session.hasExtension(plain.requested_extension || plain.destination_extension) && !plain.answered;
+    return callLog;
   }
 
   static newFrom(profile         ) {

package/lib/domain/__tests__/CallSession.test.js

@@ -2,7 +2,6 @@
 
 var sessionState = 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 */
 
@@ -354,7 +337,7 @@ class CallSession {
     return newFrom(callSession, CallSession);
   }
 
-  static parseCall(session         , call      )              {
+  static parseCall(call      )              {
     return new CallSession({
       callId: call.id,
       sipCallId: call.sipCallId,

package/lib/domain/__tests__/IndirectTransfer.test.js

@@ -2,7 +2,6 @@
 
 var sessionState = 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 */
 
@@ -354,7 +337,7 @@ class CallSession {
     return newFrom(callSession, CallSession);
   }
 
-  static parseCall(session         , call      )              {
+  static parseCall(call      )              {
     return new CallSession({
       callId: call.id,
       sipCallId: call.sipCallId,

package/lib/domain/__tests__/Room.test.js

@@ -2,7 +2,6 @@
 
 var sessionState = 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 */
 
@@ -354,7 +337,7 @@ class CallSession {
     return newFrom(callSession, CallSession);
   }
 
-  static parseCall(session         , call      )              {
+  static parseCall(call      )              {
     return new CallSession({
       callId: call.id,
       sipCallId: call.sipCallId,