@wazo/sdk 0.38.5 → 0.38.8

package/lib/__tests__/web-rtc-client.test.js

@@ -787,6 +787,24 @@ const fixSdp = (sdp        , candidates          , forcePort          = true)
   return fixed;
 };
 
+const addIcesInAllBundles = (sdp        ) => {
+  const parsedSdp = sdpParser__default['default'].parse(sdp);
+
+  const mediaWithCandidate = parsedSdp.media.find(media => !!media.candidates);
+  if (!mediaWithCandidate) {
+    return sdp;
+  }
+
+  const { candidates } = mediaWithCandidate;
+
+  parsedSdp.media = parsedSdp.media.map(media => ({
+    ...media,
+    candidates: media.candidates || candidates,
+  }));
+
+  return sdpParser__default['default'].write(parsedSdp);
+};
+
 /* global RTCSessionDescriptionInit, navigator */
 
 const wazoLogger = IssueReporter$1 ? IssueReporter$1.loggerFor('webrtc-sdh') : console;
@@ -916,7 +934,10 @@ class WazoSessionDescriptionHandler extends sessionDescriptionHandler.SessionDes
 
         // Check if we got ICEs
         if (sdp.indexOf('a=candidate') !== -1) {
-          return description;
+          return {
+            type: description.type,
+            sdp: addIcesInAllBundles(sdp),
+          };
         }
 
         wazoLogger.info('No ICE candidates found in SDP, fixing it with gathered ices', this.gatheredCandidates);
@@ -3190,6 +3211,70 @@ class ExternalApp {
 
 //      
 
+class MeetingAuthorization {
+                      
+               
+                   
+                   
+                 
+
+  constructor({
+    meetingUuid,
+    uuid,
+    userUuid,
+    userName,
+  }         = {}) {
+    this.meetingUuid = meetingUuid;
+    this.uuid = uuid;
+    this.userUuid = userUuid;
+    this.userName = userName;
+  }
+
+  setStatus(status        ) {
+    this.status = status;
+  }
+
+  getStatus() {
+    return this.status;
+  }
+
+  static parse(plain                         ) {
+    const {
+      meeting_uuid: meetingUuid,
+      uuid,
+      guest_uuid: userUuid,
+      guest_name: userName,
+    } = plain;
+
+    return new MeetingAuthorization({
+      meetingUuid,
+      uuid,
+      userUuid,
+      userName,
+    });
+  }
+
+  static parseMany(items                           )                              {
+    if (!items) {
+      return [];
+    }
+    return items.map(MeetingAuthorization.parse);
+  }
+}
+
+//      
+
+                                      
+               
+                                
+                      
+ 
+
+                                      
+                
+                                 
+ 
+
                                        
                                   
                            
@@ -3200,6 +3285,7 @@ class ExternalApp {
                 
                       
                         
+                                 
  
 
 class Meeting {
@@ -3214,6 +3300,8 @@ class Meeting {
                       
                             
                      
+                                                    
+                                
 
   static parse(plain                         )          {
     return new Meeting({
@@ -3226,6 +3314,7 @@ class Meeting {
       extension: plain.exten,
       persistent: plain.persistent,
       creationTime: moment__default['default'](plain.creation_time).toDate(),
+      requireAuthorization: plain.require_authorization,
     });
   }
 
@@ -3250,6 +3339,7 @@ class Meeting {
     extension,
     persistent,
     creationTime,
+    requireAuthorization,
   }         = {}) {
     this.guestSipAuthorization = guestSipAuthorization;
     this.uri = uri;
@@ -3260,6 +3350,7 @@ class Meeting {
     this.extension = extension;
     this.persistent = persistent;
     this.creationTime = creationTime;
+    this.requireAuthorization = requireAuthorization;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'Meeting';
@@ -3270,8 +3361,32 @@ class Meeting {
     const [username, secret] = atob(this.guestSipAuthorization).split(':');
     return { username, secret };
   }
+
 }
 
+//      
+
+const camelToUnderscore = (key        ) => {
+  if (typeof key !== 'string') {
+    throw new Error('Input is not a string');
+  }
+  return key.charAt(0).toLowerCase() + key.substring(1).replace(/([A-Z])/g, '_$1').toLowerCase();
+};
+
+//      
+
+const convertKeysFromCamelToUnderscore = (args        ) => {
+  if (!args || typeof args !== 'object' || Array.isArray(args)) {
+    throw new Error('Input is not an object');
+  }
+
+  return Object.keys(args).reduce((acc, key) => {
+    acc[camelToUnderscore(key)] = typeof args[key] === 'object' && !Array.isArray(args[key])
+      ? convertKeysFromCamelToUnderscore(args[key]) : args[key];
+    return acc;
+  }, {});
+};
+
 /*       */
 
 var confdMethods = (client              , baseUrl        ) => ({
@@ -3340,8 +3455,18 @@ var confdMethods = (client              , baseUrl        ) => ({
   getMyMeetings: ()                   =>
     client.get(`${baseUrl}/users/me/meetings`).then(response => Meeting.parseMany(response.items)),
 
-  createMyMeeting: (name        , persistent         )                   =>
-    client.post(`${baseUrl}/users/me/meetings`, { name, persistent }).then(Meeting.parse),
+  createMyMeeting: (args                        )                   =>
+    client
+      .post(`${baseUrl}/users/me/meetings`, convertKeysFromCamelToUnderscore(args))
+      .then(Meeting.parse),
+
+  updateMyMeeting: (meetingUuid        , data                        )                   =>
+    client.put(
+      `${baseUrl}/users/me/meetings/${meetingUuid}`,
+      convertKeysFromCamelToUnderscore(data),
+      null,
+      ApiRequester.successResponseParser,
+    ),
 
   deleteMyMeeting: (meetingUuid        )                   =>
     client.delete(`${baseUrl}/users/me/meetings/${meetingUuid}`, null),
@@ -3349,8 +3474,36 @@ var confdMethods = (client              , baseUrl        ) => ({
   getMeeting: (meetingUuid        )                   =>
     client.get(`${baseUrl}/meetings/${meetingUuid}`, null).then(Meeting.parse),
 
+  meetingAuthorizations: (meetingUuid        )                                       =>
+    client.get(`${baseUrl}/users/me/meetings/${meetingUuid}/authorizations`, null).then(MeetingAuthorization.parseMany),
+
+  meetingAuthorizationReject: (meetingUuid        , authorizationUuid        )                   =>
+    client.put(
+      `${baseUrl}/users/me/meetings/${meetingUuid}/authorizations/${authorizationUuid}/reject`,
+      {},
+      null,
+      ApiRequester.successResponseParser,
+    ),
+
+  meetingAuthorizationAccept: (meetingUuid        , authorizationUuid        )                   =>
+    client.put(
+      `${baseUrl}/users/me/meetings/${meetingUuid}/authorizations/${authorizationUuid}/accept`,
+      {},
+      null,
+      ApiRequester.successResponseParser,
+    ),
+
   guestGetMeeting: (meetingUuid        )                   =>
     client.get(`${baseUrl}/guests/me/meetings/${meetingUuid}`, null).then(Meeting.parse),
+
+  guestAuthorizationRequest: (userUuid        , meetingUuid        , username        )            =>
+    client
+      .post(`${baseUrl}/guests/${userUuid}/meetings/${meetingUuid}/authorizations`, { guest_name: username })
+      .then(MeetingAuthorization.parse),
+
+  guestAuthorizationCheck: (userUuid        , meetingUuid        , authorizationUuid        )            =>
+    client.get(`${baseUrl}/guests/${userUuid}/meetings/${meetingUuid}/authorizations/${authorizationUuid}`, null),
+
 });
 
 //      
@@ -3616,6 +3769,7 @@ const RECORD_STATE_ACTIVE = 'active';
                            
                  
                      
+                     
                    
                         
                    
@@ -3626,6 +3780,7 @@ const RECORD_STATE_ACTIVE = 'active';
 
                       
              
+                    
                     
                     
                      
@@ -3654,6 +3809,7 @@ class Call {
                           
                   
                     
+                   
                   
                  
                  
@@ -3678,6 +3834,7 @@ class Call {
       calleeNumber: plain.peer_caller_id_number,
       dialedExtension: plain.dialed_extension,
       isCaller: plain.is_caller,
+      isVideo: plain.is_video,
       muted: plain.muted,
       onHold: plain.on_hold,
       status: plain.status,
@@ -3701,6 +3858,7 @@ class Call {
     calleeNumber,
     dialedExtension,
     isCaller,
+    isVideo,
     lineId,
     muted,
     onHold,
@@ -3724,6 +3882,7 @@ class Call {
     this.startingTime = startingTime;
     this.talkingToIds = talkingToIds || [];
     this.recording = recording;
+    this.isVideo = !!isVideo;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'Call';
@@ -4783,6 +4942,14 @@ var calldMethods = (client              , baseUrl        ) => ({
   getMeetingParticipantsAsUser: async (meetingUuid        )                  =>
     client.get(`${baseUrl}/users/me/meetings/${meetingUuid}/participants`),
 
+  banMeetingParticipant: (meetingUuid        , participantUuid        ) =>
+    client.delete(
+      `${baseUrl}/users/me/meetings/${meetingUuid}/participants/${participantUuid}`,
+      null,
+      null,
+      ApiRequester.successResponseParser,
+    ),
+
   listTrunks: () => client.get(`${baseUrl}/trunks`),
 
   mute: (callId        ) =>
@@ -6423,41 +6590,58 @@ class WebRTCClient extends Emitter {
     });
   }
 
-  changeAudioInputDevice(id        , session          ) {
+  async changeAudioInputDevice(id        , session          , force          ) {
     const currentId = this.getAudioDeviceId();
     logger.info('setting audio input device', { id, currentId, session: !!session });
 
-    if (id === currentId) {
+    if (!force && id === currentId) {
       return null;
     }
 
+    // in order to handle an audio track change for default devices
+    // we need the actual id of the device (not 'default')
+    let deviceId = id;
+    if (id === 'default' && navigator.mediaDevices) {
+      const devices = await navigator.mediaDevices.enumerateDevices();
+      const defaultDevice = devices.find(device => device.deviceId === 'default');
+      if (defaultDevice) {
+        const deviceLabel = defaultDevice.label.replace('Default - ', '');
+        const targetDevice = devices.find(device => device.label === deviceLabel);
+        if (targetDevice) {
+          deviceId = targetDevice.deviceId;
+          if (!force && deviceId === currentId) {
+            return null;
+          }
+        }
+      }
+    }
+
     // let's update the local audio value
     if (this.audio) {
       this.audio = {
         deviceId: {
-          exact: id,
+          exact: deviceId,
         },
       };
     }
 
-    if (session) {
+    if (session && navigator.mediaDevices) {
       const sdh = session.sessionDescriptionHandler;
       const pc = sdh.peerConnection;
 
-      // $FlowFixMe
-      return navigator.mediaDevices.getUserMedia({ audio: { deviceId: { exact: id } } }).then(async stream => {
-        const audioTrack = stream.getAudioTracks()[0];
-        const sender = pc && pc.getSenders().find(s => audioTrack && s && s.track && s.track.kind === audioTrack.kind);
+      const constraints = { audio: { deviceId: { exact: deviceId } } };
+      const stream = await navigator.mediaDevices.getUserMedia(constraints);
+      const audioTrack = stream.getAudioTracks()[0];
+      const sender = pc && pc.getSenders().find(s => audioTrack && s && s.track && s.track.kind === audioTrack.kind);
 
-        if (sender) {
-          if (sender.track) {
-            audioTrack.enabled = sender.track.enabled;
-          }
-          sender.replaceTrack(audioTrack);
+      if (sender) {
+        if (sender.track) {
+          audioTrack.enabled = sender.track.enabled;
         }
+        sender.replaceTrack(audioTrack);
+      }
 
-        return stream;
-      });
+      return stream;
     }
   }
 
@@ -6477,14 +6661,14 @@ class WebRTCClient extends Emitter {
       return null;
     }
 
-    // let's update the local video value
-    if (this.video) {
-      this.video = {
-        deviceId: {
-          exact: id,
-        },
-      };
-    }
+    // let's make sure we don't lose other video constraints settings -- width, height, frameRate...
+    const videoObject = typeof this.video === 'object' ? this.video : {};
+    this.video = {
+      ...videoObject,
+      deviceId: {
+        exact: id,
+      },
+    };
   }
 
   changeSessionVideoInputDevice(id         , session         ) {
@@ -7611,3 +7795,96 @@ describe('WebRTC client', () => {
     expect(client.isAudioMuted(oldKindUnmuted)).toBeFalsy();
   });
 });
+
+describe('changeAudioInputDevice', () => {
+  const defaultId = 'default';
+  const deviceId = 'device1';
+  const constraints = { audio: { deviceId: { exact: defaultId } }, video: null };
+
+  const session = {
+    sessionDescriptionHandler: {
+      peerConnection: {
+        getSenders: () => [{ track: { kind: 'audio', enabled: true } }],
+      },
+    },
+  };
+
+  const stream = {};
+  const getAudioTracksMock = jest.fn(() => []);
+  Object.defineProperty(stream, 'getAudioTracks', {
+    value: getAudioTracksMock,
+  });
+
+  const getUserMediaMock = jest.fn(async () => {
+    return new Promise(resolve => {
+      resolve(stream);
+    });
+  });
+
+  const devices = [
+    { deviceId: 'default', kind: 'audioinput', label: 'Default - Fake Microphone', groupId: 'fak3Gr0up3' },
+    { deviceId: 'fak3d3v1c3', kind: 'audioinput', label: 'Fake Microphone', groupId: 'fak3Gr0up3' },
+  ];
+  const enumerateDevicesMock = jest.fn(async () => {
+    return new Promise(resolve => {
+      resolve(devices);
+    });
+  });
+
+  Object.defineProperty(global.navigator, 'mediaDevices', {
+    value: {
+      getUserMedia: getUserMediaMock,
+      enumerateDevices: enumerateDevicesMock,
+    },
+  });
+
+  it('should change the audio input track if the provided id is different', async () => {
+    client.setMediaConstraints(constraints);
+    expect(client.getAudioDeviceId()).toBe(defaultId);
+    const result = await client.changeAudioInputDevice(deviceId, session);
+    expect(result).toBeTruthy();
+  });
+
+  it('should NOT change the audio input track if the provided id is the same', async () => {
+    client.setMediaConstraints(constraints);
+    expect(client.getAudioDeviceId()).toBe(defaultId);
+    const result = await client.changeAudioInputDevice(defaultId, session);
+    expect(result).toBeFalsy();
+  });
+
+  it('should change the audio input track if the provided id is the same and force param is TRUE', async () => {
+    client.setMediaConstraints(constraints);
+    expect(client.getAudioDeviceId()).toBe(defaultId);
+    const result = await client.changeAudioInputDevice(defaultId, session, true);
+    expect(result).toBeTruthy();
+  });
+
+  describe('setVideoInputDevice', () => {
+    it('should retain its original video values', () => {
+      const video = { height: { min: 480, max: 720 }, width: { min: 640, max: 1280 } };
+
+      client.video = video;
+      client.setVideoInputDevice(deviceId);
+      expect(client.video).toEqual({ ...video, deviceId: { exact: deviceId } });
+    });
+
+    it('should set deviceId when video\'s original value is true', () => {
+      client.video = true;
+      client.setVideoInputDevice(deviceId);
+      expect(client.video).toEqual({ deviceId: { exact: deviceId } });
+    });
+
+    it('should set deviceId when video\'s original value is not set', () => {
+      client.video = undefined;
+      client.setVideoInputDevice(deviceId);
+      expect(client.video).toEqual({ deviceId: { exact: deviceId } });
+    });
+
+    it('should NOT set deviceId when its value does not change', () => {
+      client.video = { deviceId: { exact: deviceId } };
+      const result = client.setVideoInputDevice(deviceId);
+      expect(result).toEqual(null);
+      expect(client.video).toEqual({ deviceId: { exact: deviceId } });
+    });
+  });
+});

package/lib/api/calld.js

@@ -974,6 +974,7 @@ const RECORD_STATE_ACTIVE = 'active';
                            
                  
                      
+                     
                    
                         
                    
@@ -984,6 +985,7 @@ const RECORD_STATE_ACTIVE = 'active';
 
                       
              
+                    
                     
                     
                      
@@ -1012,6 +1014,7 @@ class Call {
                           
                   
                     
+                   
                   
                  
                  
@@ -1036,6 +1039,7 @@ class Call {
       calleeNumber: plain.peer_caller_id_number,
       dialedExtension: plain.dialed_extension,
       isCaller: plain.is_caller,
+      isVideo: plain.is_video,
       muted: plain.muted,
       onHold: plain.on_hold,
       status: plain.status,
@@ -1059,6 +1063,7 @@ class Call {
     calleeNumber,
     dialedExtension,
     isCaller,
+    isVideo,
     lineId,
     muted,
     onHold,
@@ -1082,6 +1087,7 @@ class Call {
     this.startingTime = startingTime;
     this.talkingToIds = talkingToIds || [];
     this.recording = recording;
+    this.isVideo = !!isVideo;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'Call';
@@ -1395,6 +1401,14 @@ var calld = (client              , baseUrl        ) => ({
   getMeetingParticipantsAsUser: async (meetingUuid        )                  =>
     client.get(`${baseUrl}/users/me/meetings/${meetingUuid}/participants`),
 
+  banMeetingParticipant: (meetingUuid        , participantUuid        ) =>
+    client.delete(
+      `${baseUrl}/users/me/meetings/${meetingUuid}/participants/${participantUuid}`,
+      null,
+      null,
+      ApiRequester.successResponseParser,
+    ),
+
   listTrunks: () => client.get(`${baseUrl}/trunks`),
 
   mute: (callId        ) =>