@wazo/sdk 0.38.5 → 0.38.8

package/esm/simple/utils.js

@@ -2645,6 +2645,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);
+  }
+}
+
+//      
+
+                                      
+               
+                                
+                      
+ 
+
+                                      
+                
+                                 
+ 
+
                                        
                                   
                            
@@ -2655,6 +2719,7 @@ class ExternalApp {
                 
                       
                         
+                                 
  
 
 class Meeting {
@@ -2669,6 +2734,8 @@ class Meeting {
                       
                             
                      
+                                                    
+                                
 
   static parse(plain                         )          {
     return new Meeting({
@@ -2681,6 +2748,7 @@ class Meeting {
       extension: plain.exten,
       persistent: plain.persistent,
       creationTime: moment(plain.creation_time).toDate(),
+      requireAuthorization: plain.require_authorization,
     });
   }
 
@@ -2705,6 +2773,7 @@ class Meeting {
     extension,
     persistent,
     creationTime,
+    requireAuthorization,
   }         = {}) {
     this.guestSipAuthorization = guestSipAuthorization;
     this.uri = uri;
@@ -2715,6 +2784,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';
@@ -2725,8 +2795,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        ) => ({
@@ -2795,8 +2889,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),
@@ -2804,8 +2908,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),
+
 });
 
 //      
@@ -3071,6 +3203,7 @@ const RECORD_STATE_ACTIVE = 'active';
                            
                  
                      
+                     
                    
                         
                    
@@ -3081,6 +3214,7 @@ const RECORD_STATE_ACTIVE = 'active';
 
                       
              
+                    
                     
                     
                      
@@ -3109,6 +3243,7 @@ class Call {
                           
                   
                     
+                   
                   
                  
                  
@@ -3133,6 +3268,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,
@@ -3156,6 +3292,7 @@ class Call {
     calleeNumber,
     dialedExtension,
     isCaller,
+    isVideo,
     lineId,
     muted,
     onHold,
@@ -3179,6 +3316,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';
@@ -3652,7 +3790,7 @@ class CallSession {
       ringing: call.isRinging(),
       answered: call.isUp(),
       answeredBySystem: call.isUp() && call.talkingToIds.length === 0,
-      cameraEnabled: false,
+      cameraEnabled: call.isVideo,
       dialedExtension: call.dialedExtension,
       call,
       conference: false, // @FIXME?
@@ -5050,6 +5188,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        ) =>
@@ -6198,6 +6344,24 @@ const fixSdp = (sdp        , candidates          , forcePort          = true)
   return fixed;
 };
 
+const addIcesInAllBundles = (sdp        ) => {
+  const parsedSdp = sdpParser.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.write(parsedSdp);
+};
+
 /* global RTCSessionDescriptionInit, navigator */
 
 const wazoLogger = IssueReporter$1 ? IssueReporter$1.loggerFor('webrtc-sdh') : console;
@@ -6327,7 +6491,10 @@ class WazoSessionDescriptionHandler extends SessionDescriptionHandler {
 
         // 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);
@@ -7787,41 +7954,58 @@ class WebRTCClient extends Emitter {
     });
   }
 
-  changeAudioInputDevice(id        , session          ) {
+  async changeAudioInputDevice(id        , session          , force          ) {
     const currentId = this.getAudioDeviceId();
     logger$8.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;
     }
   }
 
@@ -7841,14 +8025,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         ) {
@@ -9587,10 +9771,10 @@ class WebRTCPhone extends Emitter                  {
     this.audioRingVolume = volume;
   }
 
-  changeAudioInputDevice(id        ) {
+  changeAudioInputDevice(id        , force          ) {
     logger$7.info('WebRTC phone - changeAudio input device', { deviceId: id });
 
-    return this.client.changeAudioInputDevice(id, this.currentSipSession);
+    return this.client.changeAudioInputDevice(id, this.currentSipSession, force);
   }
 
   changeVideoInputDevice(id         ) {
@@ -11243,6 +11427,7 @@ const AGENT_UNPAUSED = 'agent_unpaused';
 const CONFERENCE_ADHOC_PARTICIPANT_LEFT = 'conference_adhoc_participant_left';
 const CONFERENCE_ADHOC_DELETED = 'conference_adhoc_deleted';
 const MEETING_USER_PROGRESS = 'meeting_user_progress';
+const MEETING_USER_GUEST_AUTHORIZATION_CREATED = 'meeting_user_guest_authorization_created';
 
 const BLACKLIST_EVENTS = [
   CHAT_MESSAGE_SENT,
@@ -11594,6 +11779,7 @@ WebSocketClient.eventLists = [
   CONFERENCE_ADHOC_PARTICIPANT_LEFT,
   CONFERENCE_ADHOC_DELETED,
   MEETING_USER_PROGRESS,
+  MEETING_USER_GUEST_AUTHORIZATION_CREATED,
 ];
 
 var WebSocketClient$1 = /*#__PURE__*/Object.freeze({
@@ -11665,6 +11851,7 @@ var WebSocketClient$1 = /*#__PURE__*/Object.freeze({
   CONFERENCE_ADHOC_PARTICIPANT_LEFT: CONFERENCE_ADHOC_PARTICIPANT_LEFT,
   CONFERENCE_ADHOC_DELETED: CONFERENCE_ADHOC_DELETED,
   MEETING_USER_PROGRESS: MEETING_USER_PROGRESS,
+  MEETING_USER_GUEST_AUTHORIZATION_CREATED: MEETING_USER_GUEST_AUTHORIZATION_CREATED,
   HEARTBEAT_ENGINE_VERSION: HEARTBEAT_ENGINE_VERSION,
   'default': WebSocketClient
 });
@@ -11769,6 +11956,7 @@ class Participant extends Emitter {
                       
                          
                     
+                  
                 
 
                      
@@ -11786,6 +11974,7 @@ class Participant extends Emitter {
                           
                   
                     
+                 
 
   /**
    * @param room Room The room where the participant is
@@ -11809,6 +11998,7 @@ class Participant extends Emitter {
     this.screensharing = false;
     this.isOnHold = false;
     this.extra = extra;
+    this.banned = false;
 
     this.ON_UPDATED = 'participant/ON_UPDATED';
     this.ON_START_TALKING = 'participant/ON_START_TALKING';
@@ -11825,6 +12015,7 @@ class Participant extends Emitter {
     this.ON_EXTRA_CHANGE = 'participant/ON_EXTRA_CHANGE';
     this.ON_HOLD = 'participant/ON_HOLD';
     this.ON_RESUME = 'participant/ON_RESUME';
+    this.ON_BAN = 'participant/ON_BAN';
   }
 
   triggerEvent(name        , ...args       ) {
@@ -11865,6 +12056,10 @@ class Participant extends Emitter {
         status.extra = this.extra;
         break;
       }
+      case this.ON_BAN: {
+        status.banned = true;
+        break;
+      }
     }
 
     if (broadcast) {
@@ -11967,6 +12162,11 @@ class Participant extends Emitter {
     this.triggerUpdate(this.ON_RESUME, broadcast);
   }
 
+  onBan(broadcast          = true) {
+    this.banned = true;
+    this.triggerUpdate(this.ON_BAN, broadcast);
+  }
+
   getStatus() {
     return {
       callId: this.callId,
@@ -12013,6 +12213,10 @@ class Participant extends Emitter {
       }
     }
 
+    if (status.banned) {
+      this.onBan(false);
+    }
+
     // Poor man's object comparison
     if (typeof status.extra !== 'undefined' && JSON.stringify(this.extra) !== JSON.stringify(status.extra)) {
       this.extra = { ...this.extra, ...status.extra };
@@ -12040,6 +12244,28 @@ class Participant extends Emitter {
     this.streams = streams;
     this.videoStreams = streams;
   }
+
+  async ban(apiRequestDelay          = null) {
+    const { meetingUuid } = this.room;
+    if (!meetingUuid) {
+      throw new Error('Attempting to ban a participant without a `meetingUuid`');
+    }
+
+    // this notifies all that someone is being banned
+    this.onBan(true);
+
+    // this allows to delay the actual ban, in order for the banned participant as well as others to react to the situation
+    if (apiRequestDelay) {
+      await this.delay(apiRequestDelay);
+    }
+
+    // proceed with the actual kick
+    return getApiClient().calld.banMeetingParticipant(meetingUuid, this.callId);
+  }
+
+  async delay(ms        ) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  }
 }
 
 //      
@@ -12192,7 +12418,7 @@ class Room$1 extends Emitter {
     logger$2.info('connecting to room', { extension, audioOnly, room: !!room });
 
     if (!room) {
-      await Wazo.Phone.connect();
+      await Wazo.Phone.connect({ media: constraints });
 
       const withCamera = constraints && !!constraints.video;
 
@@ -12637,7 +12863,7 @@ class Room$1 extends Emitter {
         const participant               = this._getParticipantFromCallId(status.callId);
 
         if (participant) {
-          // we're received, so no need to broadcast, hence the input false arg
+          // we're receiving, so no need to broadcast
           participant.updateStatus(status, false);
         }
         break;
@@ -12904,7 +13130,7 @@ class SipRoom extends Room$1 {
     logger$1.info('connecting to sip room', { extension, audioOnly, room: !!room });
 
     if (!room) {
-      await Wazo.Phone.connect();
+      await Wazo.Phone.connect({ media: constraints });
 
       const withCamera = constraints && !!constraints.video;
 

package/esm/utils/__tests__/object.test.js

@@ -0,0 +1,57 @@
+//      
+
+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;
+  }, {});
+};
+
+//      
+
+describe('object utils', () => {
+  describe('convertKeysFromCamelToUnderscore', () => {
+    it('should throw an error when input is not an object', () => {
+      const msg = 'Input is not an object';
+      expect(() => convertKeysFromCamelToUnderscore(true)).toThrow(msg);
+      expect(() => convertKeysFromCamelToUnderscore(null)).toThrow(msg);
+      expect(() => convertKeysFromCamelToUnderscore(undefined)).toThrow(msg);
+      expect(() => convertKeysFromCamelToUnderscore([])).toThrow(msg);
+      expect(() => convertKeysFromCamelToUnderscore('some-string')).toThrow(msg);
+    });
+
+    it('should convert camel-cased keys to underscore', () => {
+      let value = Math.random();
+      expect(convertKeysFromCamelToUnderscore({ LoremIpsum: value })).toEqual({ lorem_ipsum: value });
+      value = Math.random();
+      expect(convertKeysFromCamelToUnderscore({ loremIpsum: value })).toEqual({ lorem_ipsum: value });
+      value = Math.random();
+      expect(convertKeysFromCamelToUnderscore({ 'lorem-ipsum': value })).toEqual({ 'lorem-ipsum': value });
+      value = Math.random();
+      expect(convertKeysFromCamelToUnderscore({ L123: value })).toEqual({ l123: value });
+    });
+
+    it('should handle multi-leveled object', () => {
+      const value = Math.random();
+      expect(convertKeysFromCamelToUnderscore({ LoremIpsum: { DoloreSit: { Amet: value }, regular: 'reg' } }))
+        .toEqual({ lorem_ipsum: { dolore_sit: { amet: value }, regular: 'reg' } });
+
+      expect(convertKeysFromCamelToUnderscore({ LoremIpsum: { DoloreSit: { Amet: [value] }, regular: ['something'] } }))
+        .toEqual({ lorem_ipsum: { dolore_sit: { amet: [value] }, regular: ['something'] } });
+    });
+  });
+});

package/esm/utils/__tests__/sdp.test.js

@@ -98,6 +98,24 @@ const fixSdp = (sdp        , candidates          , forcePort          = true)
   return fixed;
 };
 
+const addIcesInAllBundles = (sdp        ) => {
+  const parsedSdp = sdpParser.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.write(parsedSdp);
+};
+
 /* eslint-disable max-len */
 
 const goodSdp = `
@@ -262,4 +280,36 @@ describe('SDP utils', () => {
       expect(hasAnActiveVideo(inactiveVideo)).toBeFalsy();
     });
   });
+
+  describe('Adding candidate in all bundles ', () => {
+    it('should add candidate everywhere', async () => {
+      const audioWithoutCandidate = `
+c=IN IP4 203.0.113.1
+m=audio 54400 RTP/SAVPF 0 96
+m=video 54400 RTP/SAVPF 0 96
+a=candidate:0 1 UDP 2113667327 203.0.113.1 54400 typ host
+a=candidate:3996450952 1 udp 41819903 14.72.21.2 65092 typ relay raddr 0.0.0.0 rport 0 generation 0 network-id 3 network-cost 10
+`;
+      const fixedAudioWithoutCandidate = sdpParser.parse(addIcesInAllBundles(audioWithoutCandidate));
+
+      expect(fixedAudioWithoutCandidate.media[0].candidates[0].type).toBe('host');
+      expect(fixedAudioWithoutCandidate.media[0].candidates[1].type).toBe('relay');
+      expect(fixedAudioWithoutCandidate.media[1].candidates[0].type).toBe('host');
+      expect(fixedAudioWithoutCandidate.media[1].candidates[1].type).toBe('relay');
+
+      // It should not add candidate if already present
+      const audioWithCandidate = `
+c=IN IP4 203.0.113.1
+m=audio 54400 RTP/SAVPF 0 96
+a=candidate:0 1 UDP 2113667327 203.0.113.1 54400 typ srflx
+
+m=video 54400 RTP/SAVPF 0 96
+a=candidate:0 1 UDP 2113667327 203.0.113.1 54400 typ host
+`;
+      const fixedAudioWithCandidate = sdpParser.parse(addIcesInAllBundles(audioWithCandidate));
+
+      expect(fixedAudioWithCandidate.media[0].candidates[0].type).toBe('srflx');
+      expect(fixedAudioWithCandidate.media[1].candidates[0].type).toBe('host');
+    });
+  });
 });