@wazo/sdk 0.37.23 → 0.37.24

package/lib/websocket-client.js

@@ -45,7 +45,7 @@ const isMobile = () => typeof navigator !== 'undefined' && navigator.product ===
 
 /*       */
 
-IssueReporter$1 ? IssueReporter$1.loggerFor('api') : console;
+const logger = IssueReporter$1 ? IssueReporter$1.loggerFor('api') : console;
 
 // Use a function here to be able to mock it in tests
 const realFetch = () => {
@@ -621,7 +621,7 @@ const BLACKLIST_EVENTS = [
 ];
 
 const HEARTBEAT_ENGINE_VERSION = '20.09';
-const logger = IssueReporter$1.loggerFor('wazo-ws');
+const logger$1 = IssueReporter$1.loggerFor('wazo-ws');
 const messageLogger = IssueReporter$1.loggerFor('wazo-ws-message');
 
 class WebSocketClient extends Emitter {
@@ -670,19 +670,19 @@ class WebSocketClient extends Emitter {
   }
 
   connect() {
-    logger.info('connect method started', { host: this.host, token: this.token });
+    logger$1.info('connect method started', { host: this.host, token: this.token });
     this.socket = new ReconnectingWebSocket__default['default'](this._getUrl.bind(this), [], this.options);
     if (this.options.binaryType) {
       this.socket.binaryType = this.options.binaryType;
     }
 
     this.socket.onopen = () => {
-      logger.info('on Wazo WS open', { method: 'connect', host: this.host });
+      logger$1.info('on Wazo WS open', { method: 'connect', host: this.host });
       this.eventEmitter.emit(SOCKET_EVENTS.ON_OPEN);
     };
 
     this.socket.onerror = event => {
-      logger.error('on Wazo WS error', event.target);
+      logger$1.error('on Wazo WS error', event.target);
       this.eventEmitter.emit(SOCKET_EVENTS.ON_ERROR, event);
     };
 
@@ -712,7 +712,7 @@ class WebSocketClient extends Emitter {
 
     this.socket.onclose = event => {
       // Can't be converted to JSON (circular structure)
-      logger.info('on Wazo WS close', {
+      logger$1.info('on Wazo WS close', {
         reason: event.reason,
         code: event.code,
         readyState: event.target.readyState,
@@ -730,12 +730,12 @@ class WebSocketClient extends Emitter {
     };
 
     this.socket.onerror = event => {
-      logger.info('Wazo WS error', { message: event.message, code: event.code, readyState: event.target.readyState });
+      logger$1.info('Wazo WS error', { message: event.message, code: event.code, readyState: event.target.readyState });
     };
   }
 
   close(force          = false)       {
-    logger.info('Wazo WS close', { socket: !!this.socket, host: this.host, token: this.token });
+    logger$1.info('Wazo WS close', { socket: !!this.socket, host: this.host, token: this.token });
 
     if (!this.socket) {
       return;
@@ -753,7 +753,7 @@ class WebSocketClient extends Emitter {
 
   updateToken(token        ) {
     this.token = token;
-    logger.info('Wazo WS updating token', { url: this._getUrl(), token, socket: !!this.socket });
+    logger$1.info('Wazo WS updating token', { url: this._getUrl(), token, socket: !!this.socket });
 
     if (this.socket) {
       // If still connected, send the token to the WS
@@ -771,7 +771,7 @@ class WebSocketClient extends Emitter {
   }
 
   startHeartbeat() {
-    logger.info('Wazo WS start heartbeat', { host: this.host, token: this.token });
+    logger$1.info('Wazo WS start heartbeat', { host: this.host, token: this.token });
 
     if (!this.socket) {
       this.heartbeat.stop();
@@ -785,7 +785,7 @@ class WebSocketClient extends Emitter {
   }
 
   stopHeartbeat() {
-    logger.info('Wazo WS stop heartbeat', { host: this.host, token: this.token });
+    logger$1.info('Wazo WS stop heartbeat', { host: this.host, token: this.token });
 
     this.heartbeat.stop();
   }
@@ -815,7 +815,7 @@ class WebSocketClient extends Emitter {
   }
 
   reconnect(reason        ) {
-    logger.info('Wazo WS reconnect', { reason, socket: !!this.socket, host: this.host, token: this.token });
+    logger$1.info('Wazo WS reconnect', { reason, socket: !!this.socket, host: this.host, token: this.token });
     if (!this.socket) {
       return;
     }
@@ -871,7 +871,7 @@ class WebSocketClient extends Emitter {
       this.close();
     }
     const url = `wss://${this.host || ''}/api/websocketd/?token=${this.token || ''}&version=${this.version}`;
-    logger.log('Wazo WS url computed to reconnect', { url });
+    logger$1.log('Wazo WS url computed to reconnect', { url });
 
     return url;
   }
@@ -879,12 +879,12 @@ class WebSocketClient extends Emitter {
   _onHeartbeat(message        ) {
     if (message.payload === 'pong') {
       this.heartbeat.onHeartbeat();
-      logger.log('on heartbeat received from Wazo WS');
+      logger$1.log('on heartbeat received from Wazo WS');
     }
   }
 
   async _onHeartbeatTimeout() {
-    logger.log('heartbeat timed out', { host: this.host, token: this.token });
+    logger$1.log('heartbeat timed out', { host: this.host, token: this.token });
 
     this.close();
     this.eventEmitter.emit(SOCKET_EVENTS.ON_CLOSE, new Error('Websocket ping failure.'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wazo/sdk",
-  "version": "0.37.23",
+  "version": "0.37.24",
   "description": "Wazo's JavaScript Software Development Kit.",
   "main": "dist/wazo-sdk.js",
   "author": "Wazo (http://wazo.io)",

package/src/domain/Meeting.js

@@ -1,4 +1,6 @@
 // @flow
+import moment from 'moment';
+
 import newFrom from '../utils/new-from';
 
 export type MeetingCreationResponse = {
@@ -8,8 +10,9 @@ export type MeetingCreationResponse = {
   owner_uuids: Array<string>,
   port: string,
   uuid: string,
-  number: string,
+  exten: string,
   persistent: boolean,
+  creation_time: string,
 }
 
 export default class Meeting {
@@ -20,9 +23,10 @@ export default class Meeting {
   uuid: string;
   name: string;
   port: string;
-  number: string;
+  extension: string;
   persistent: boolean;
   ownerUuids: Array<string>;
+  creationTime: Date;
 
   static parse(plain: MeetingCreationResponse): Meeting {
     return new Meeting({
@@ -32,8 +36,9 @@ export default class Meeting {
       ownerUuids: plain.owner_uuids,
       port: plain.port,
       uuid: plain.uuid,
-      number: plain.number,
+      extension: plain.exten,
       persistent: plain.persistent,
+      creationTime: moment(plain.creation_time).toDate(),
     });
   }
 
@@ -55,8 +60,9 @@ export default class Meeting {
     ownerUuids,
     port,
     uri,
-    number,
+    extension,
     persistent,
+    creationTime,
   }: Object = {}) {
     this.guestSipAuthorization = guestSipAuthorization;
     this.uri = uri;
@@ -64,8 +70,9 @@ export default class Meeting {
     this.ownerUuids = ownerUuids;
     this.port = port;
     this.uuid = uuid;
-    this.number = number;
+    this.extension = extension;
     this.persistent = persistent;
+    this.creationTime = creationTime;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'Meeting';

package/src/domain/Phone/WebRTCPhone.js

@@ -306,6 +306,11 @@ export default class WebRTCPhone extends Emitter implements Phone {
 
     this.client.downgradeToAudio(sipSession);
 
+    if (callSession) {
+      callSession.cameraEnabled = false;
+      this._updateCallSession(callSession);
+    }
+
     if (withMessage) {
       this._sendReinviteMessage(callSession, false);
     }
@@ -333,6 +338,11 @@ export default class WebRTCPhone extends Emitter implements Phone {
 
     const newStream = await this.client.upgradeToVideo(sipSession, constraints, isConference);
 
+    if (callSession) {
+      callSession.cameraEnabled = true;
+      this._updateCallSession(callSession);
+    }
+
     // If no stream is returned, it means we have to reinvite
     if (!newStream) {
       return true;
@@ -1477,9 +1487,13 @@ export default class WebRTCPhone extends Emitter implements Phone {
       if (this.shouldSendReinvite && this.currentSipSession
         && this.currentSipSession.state === SessionState.Established) {
         this.shouldSendReinvite = false;
+        const pc = this.currentSipSession.sessionDescriptionHandler.peerConnection;
+        const isConference = pc ? pc.sfu : false;
+        const hasVideo = this.currentCallSession && this.currentCallSession.cameraEnabled;
+
         try {
           // Send reinvite with iceRestart
-          this.sendReinvite(this.currentCallSession, null, false, false, true);
+          this.sendReinvite(this.currentCallSession, null, isConference, !hasVideo, true);
         } catch (e) {
           logger.error('WebRTC reinvite after register, error', { message: e.message, stack: e.stack });
         }
@@ -1563,6 +1577,15 @@ export default class WebRTCPhone extends Emitter implements Phone {
     return this.client.getSipSessionId(sipSession);
   }
 
+  _updateCallSession(callSession: CallSession) {
+    const sipSession = this.findSipSession(callSession);
+    const sipSessionId = sipSession ? this.getSipSessionId(sipSession) : null;
+
+    if (sipSessionId) {
+      this.callSessions[sipSessionId] = callSession;
+    }
+  }
+
   _onMessage(message: Message) {
     if (!message || message.method !== 'MESSAGE') {
       return;

package/src/domain/__tests__/Meeting.test.js

@@ -0,0 +1,50 @@
+// @flow
+/* global btoa */
+
+import Meeting from '../Meeting';
+
+describe('Meeting domain', () => {
+  it('can return username and secret from an base64 encrypted string', () => {
+    const USERNAME = 'username';
+    const SECRET = 'secret';
+
+    const args = {
+      guest_sip_authorization: btoa(`${USERNAME}:${SECRET}`),
+      creation_time: '',
+      ingress_http_uri: '',
+      name: '',
+      owner_uuids: [],
+      port: '',
+      uuid: '',
+      exten: '',
+      persistent: false,
+    };
+
+    const meeting = Meeting.parse(args);
+
+    const { username, secret } = meeting.getGuestSipCredentials();
+
+    expect(username).toEqual(USERNAME);
+    expect(secret).toEqual(SECRET);
+  });
+
+  it('should return a date from a string', () => {
+    const args = {
+      creation_time: '2021-12-21T15:56:42.880Z',
+      guest_sip_authorization: '',
+      ingress_http_uri: '',
+      name: '',
+      owner_uuids: [],
+      port: '',
+      uuid: '',
+      exten: '',
+      persistent: false,
+    };
+
+    const { creationTime } = Meeting.parse(args);
+
+    expect(creationTime.getDate()).toEqual(21);
+    expect(creationTime.getFullYear()).toEqual(2021);
+    expect(creationTime.getMonth()).toEqual(11);
+  });
+});