@wazo/sdk 0.37.27 → 0.37.28

package/lib/simple/utils.js

@@ -3265,8 +3265,10 @@ var updateFrom = (instance     , from     ) => {
                  
                        
                          
+                       
                                   
                       
+                  
                     
                  
                       
@@ -3283,6 +3285,7 @@ var updateFrom = (instance     , from     ) => {
                          
                      
                            
+                       
   
 
 class CallSession {
@@ -3302,8 +3305,12 @@ class CallSession {
 
                        
 
+                      
+
                     
 
+                 
+
                     
 
                     
@@ -3341,6 +3348,8 @@ class CallSession {
                      
 
                            
+
+                      
 
   constructor({
     answered,
@@ -3354,6 +3363,8 @@ class CallSession {
     paused,
     ringing,
     startTime,
+    creationTime,
+    endTime,
     cameraEnabled,
     dialedExtension,
     sipCallId,
@@ -3366,12 +3377,15 @@ class CallSession {
     recording,
     recordingPaused,
     videoRemotelyDowngraded,
+    sipSession,
   }                      ) {
     this.callId = callId;
     this.sipCallId = sipCallId;
     this.displayName = displayName;
     this.number = number;
+    this.creationTime = creationTime;
     this.startTime = startTime;
+    this.endTime = endTime;
     this.isCaller = isCaller;
     this.answered = answered;
     this.answeredBySystem = answeredBySystem;
@@ -3390,6 +3404,7 @@ class CallSession {
     this.recording = recording || false;
     this.recordingPaused = recordingPaused || false;
     this.videoRemotelyDowngraded = videoRemotelyDowngraded;
+    this.sipSession = sipSession;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'CallSession';
@@ -8735,6 +8750,7 @@ const ON_CAMERA_DISABLED = 'onCameraDisabled';
 const ON_CAMERA_RESUMED = 'onCameraResumed';
 const ON_CALL_CANCELED = 'onCallCanceled';
 const ON_CALL_FAILED = 'onCallFailed';
+const ON_CALL_REJECTED = 'onCallRejected';
 const ON_CALL_ENDED = 'onCallEnded';
 const ON_CALL_ENDING = 'onCallEnding';
 const ON_MESSAGE = 'onMessage';
@@ -8779,6 +8795,7 @@ const events = [
   ON_CAMERA_DISABLED,
   ON_CALL_FAILED,
   ON_CALL_ENDED,
+  ON_CALL_REJECTED,
   ON_MESSAGE,
   ON_REINVITE,
   ON_TRACK,
@@ -9135,6 +9152,7 @@ class WebRTCPhone extends Emitter                  {
 
           // Should be called before `_onCallTerminated` or the callCount will not decrement...
           const callSession = this._createCallSession(sipSession);
+          callSession.endTime = new Date();
           const wasCurrentSession = this._onCallTerminated(sipSession);
 
           return this.eventEmitter.emit(ON_CALL_ENDED, callSession, wasCurrentSession);
@@ -9854,6 +9872,7 @@ class WebRTCPhone extends Emitter                  {
       return Promise.resolve(null);
     }
     const callSession = this._createOutgoingCallSession(sipSession, cameraEnabled || false);
+    callSession.creationTime = new Date();
 
     this.eventEmitter.emit(ON_PLAY_PROGRESS_SOUND, this.audioOutputDeviceId, this.audioOutputVolume);
 
@@ -10132,6 +10151,7 @@ class WebRTCPhone extends Emitter                  {
           callSession);
       }
 
+      callSession.creationTime = new Date();
       this.eventEmitter.emit(ON_CALL_INCOMING, callSession, wantsToDoVideo);
     });
 
@@ -10171,6 +10191,13 @@ class WebRTCPhone extends Emitter                  {
       this.eventEmitter.emit(ON_CALL_ERROR, e);
     });
 
+    this.client.on(this.client.REJECTED, session => {
+      logger$7.info('WebRTC call rejected', session.id);
+      const callSession = this._createCallSession(session);
+      callSession.endTime = new Date();
+      this.eventEmitter.emit(ON_CALL_REJECTED, callSession);
+    });
+
     this.client.on(this.client.UNREGISTERED, () => {
       logger$7.info('WebRTC unregistered');
       this.eventEmitter.emit(ON_UNREGISTERED);
@@ -10383,6 +10410,7 @@ class WebRTCPhone extends Emitter                  {
     const number = identity ? identity.uri._normal.user : null;
     const { state } = sipSession || {};
     const sessionId = this.getSipSessionId(sipSession);
+    fromSession = fromSession || this.callSessions[sessionId];
 
     const callSession = new CallSession({
       callId: fromSession && fromSession.callId,
@@ -10390,6 +10418,8 @@ class WebRTCPhone extends Emitter                  {
       sipStatus: state,
       displayName: identity ? identity.displayName || number : number,
       startTime: fromSession ? fromSession.startTime : new Date(),
+      creationTime: fromSession ? fromSession.creationTime : null,
+      endTime: fromSession ? fromSession.endTime : null,
       answered: state === sessionState.SessionState.Established,
       paused: this.client.isCallHeld(sipSession),
       isCaller: 'incoming' in extra ? !extra.incoming : false,
@@ -10400,6 +10430,7 @@ class WebRTCPhone extends Emitter                  {
       videoMuted: fromSession ? fromSession.isVideoMuted() : false,
       recording: fromSession ? fromSession.isRecording() : false,
       recordingPaused: false, // @TODO
+      sipSession,
       ...extra,
     });
 
@@ -10428,6 +10459,7 @@ var PHONE_EVENTS = /*#__PURE__*/Object.freeze({
   ON_CAMERA_RESUMED: ON_CAMERA_RESUMED,
   ON_CALL_CANCELED: ON_CALL_CANCELED,
   ON_CALL_FAILED: ON_CALL_FAILED,
+  ON_CALL_REJECTED: ON_CALL_REJECTED,
   ON_CALL_ENDED: ON_CALL_ENDED,
   ON_CALL_ENDING: ON_CALL_ENDING,
   ON_MESSAGE: ON_MESSAGE,
@@ -10457,6 +10489,14 @@ var PHONE_EVENTS = /*#__PURE__*/Object.freeze({
   'default': WebRTCPhone
 });
 
+/*       */
+class SFUNotAvailableError extends Error {
+  constructor(message         = 'Sorry your user is not configured to support video conference') {
+    super(message);
+    this.name = 'SFUNotAvailableError';
+  }
+}
+
 //      
 
 const logger$6 = IssueReporter$1.loggerFor('simple-phone');
@@ -10841,7 +10881,7 @@ class Phone extends Emitter {
 
   checkSfu() {
     if (!this.hasSfu()) {
-      throw new Error('Sorry your user is not configured to support video conference');
+      throw new SFUNotAvailableError();
     }
   }
 
@@ -13738,6 +13778,7 @@ const Wazo = {
   InvalidSubscription,
   InvalidAuthorization,
   CanceledCallError,
+  SFUNotAvailableError,
 };
 
 if (window) {

package/package.json

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

package/src/domain/CallSession.js

@@ -1,5 +1,6 @@
 // @flow
 import { SessionState } from 'sip.js/lib/api/session-state';
+import type { Session } from 'sip.js/lib/api/session';
 
 import Call from './Call';
 import newFrom from '../utils/new-from';
@@ -12,8 +13,10 @@ type CallSessionArguments = {
   callId: string,
   callerNumber: string,
   cameraEnabled: boolean,
+  creationTime?: ?Date,
   dialedExtension?: string | null,
   displayName: string,
+  endTime?: ?Date,
   isCaller: boolean,
   muted: boolean,
   videoMuted: boolean,
@@ -30,6 +33,7 @@ type CallSessionArguments = {
   screensharing: boolean,
   recording: boolean,
   recordingPaused: boolean,
+  sipSession?: Session,
 };
 
 export default class CallSession {
@@ -49,8 +53,12 @@ export default class CallSession {
 
   callerNumber: string;
 
+  creationTime: ?Date;
+
   startTime: number;
 
+  endTime: ?Date;
+
   isCaller: boolean;
 
   answered: boolean;
@@ -89,6 +97,8 @@ export default class CallSession {
 
   recordingPaused: boolean;
 
+  sipSession: Session;
+
   constructor({
     answered,
     answeredBySystem,
@@ -101,6 +111,8 @@ export default class CallSession {
     paused,
     ringing,
     startTime,
+    creationTime,
+    endTime,
     cameraEnabled,
     dialedExtension,
     sipCallId,
@@ -113,12 +125,15 @@ export default class CallSession {
     recording,
     recordingPaused,
     videoRemotelyDowngraded,
+    sipSession,
   }: CallSessionArguments) {
     this.callId = callId;
     this.sipCallId = sipCallId;
     this.displayName = displayName;
     this.number = number;
+    this.creationTime = creationTime;
     this.startTime = startTime;
+    this.endTime = endTime;
     this.isCaller = isCaller;
     this.answered = answered;
     this.answeredBySystem = answeredBySystem;
@@ -137,6 +152,7 @@ export default class CallSession {
     this.recording = recording || false;
     this.recordingPaused = recordingPaused || false;
     this.videoRemotelyDowngraded = videoRemotelyDowngraded;
+    this.sipSession = sipSession;
 
     // Useful to compare instead of instanceof with minified code
     this.type = 'CallSession';

package/src/domain/Phone/WebRTCPhone.js

@@ -30,6 +30,7 @@ export const ON_CAMERA_DISABLED = 'onCameraDisabled';
 export const ON_CAMERA_RESUMED = 'onCameraResumed';
 export const ON_CALL_CANCELED = 'onCallCanceled';
 export const ON_CALL_FAILED = 'onCallFailed';
+export const ON_CALL_REJECTED = 'onCallRejected';
 export const ON_CALL_ENDED = 'onCallEnded';
 export const ON_CALL_ENDING = 'onCallEnding';
 export const ON_MESSAGE = 'onMessage';
@@ -74,6 +75,7 @@ export const events = [
   ON_CAMERA_DISABLED,
   ON_CALL_FAILED,
   ON_CALL_ENDED,
+  ON_CALL_REJECTED,
   ON_MESSAGE,
   ON_REINVITE,
   ON_TRACK,
@@ -430,6 +432,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
 
           // Should be called before `_onCallTerminated` or the callCount will not decrement...
           const callSession = this._createCallSession(sipSession);
+          callSession.endTime = new Date();
           const wasCurrentSession = this._onCallTerminated(sipSession);
 
           return this.eventEmitter.emit(ON_CALL_ENDED, callSession, wasCurrentSession);
@@ -1151,6 +1154,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
       return Promise.resolve(null);
     }
     const callSession = this._createOutgoingCallSession(sipSession, cameraEnabled || false);
+    callSession.creationTime = new Date();
 
     this.eventEmitter.emit(ON_PLAY_PROGRESS_SOUND, this.audioOutputDeviceId, this.audioOutputVolume);
 
@@ -1429,6 +1433,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
           callSession);
       }
 
+      callSession.creationTime = new Date();
       this.eventEmitter.emit(ON_CALL_INCOMING, callSession, wantsToDoVideo);
     });
 
@@ -1468,6 +1473,13 @@ export default class WebRTCPhone extends Emitter implements Phone {
       this.eventEmitter.emit(ON_CALL_ERROR, e);
     });
 
+    this.client.on(this.client.REJECTED, session => {
+      logger.info('WebRTC call rejected', session.id);
+      const callSession = this._createCallSession(session);
+      callSession.endTime = new Date();
+      this.eventEmitter.emit(ON_CALL_REJECTED, callSession);
+    });
+
     this.client.on(this.client.UNREGISTERED, () => {
       logger.info('WebRTC unregistered');
       this.eventEmitter.emit(ON_UNREGISTERED);
@@ -1682,6 +1694,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
     const number = identity ? identity.uri._normal.user : null;
     const { state } = sipSession || {};
     const sessionId = this.getSipSessionId(sipSession);
+    fromSession = fromSession || this.callSessions[sessionId];
 
     const callSession = new CallSession({
       callId: fromSession && fromSession.callId,
@@ -1689,6 +1702,8 @@ export default class WebRTCPhone extends Emitter implements Phone {
       sipStatus: state,
       displayName: identity ? identity.displayName || number : number,
       startTime: fromSession ? fromSession.startTime : new Date(),
+      creationTime: fromSession ? fromSession.creationTime : null,
+      endTime: fromSession ? fromSession.endTime : null,
       answered: state === SessionState.Established,
       paused: this.client.isCallHeld(sipSession),
       isCaller: 'incoming' in extra ? !extra.incoming : false,
@@ -1699,6 +1714,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
       videoMuted: fromSession ? fromSession.isVideoMuted() : false,
       recording: fromSession ? fromSession.isRecording() : false,
       recordingPaused: false, // @TODO
+      sipSession,
       ...extra,
     });
 

package/src/domain/SFUNotAvailableError.js

@@ -0,0 +1,7 @@
+/* @flow */
+export default class SFUNotAvailableError extends Error {
+  constructor(message: string = 'Sorry your user is not configured to support video conference') {
+    super(message);
+    this.name = 'SFUNotAvailableError';
+  }
+}

package/src/index.js

@@ -9,6 +9,7 @@ import IssueReporter from './service/IssueReporter';
 // Domain
 import BadResponse from './domain/BadResponse';
 import ServerError from './domain/ServerError';
+import SFUNotAvailableError from './domain/SFUNotAvailableError';
 import Call from './domain/Call';
 import CallLog from './domain/CallLog';
 import Recording from './domain/Recording';
@@ -95,6 +96,7 @@ export default {
   WazoWebSocketClient: WebSocketClient,
   BadResponse,
   ServerError,
+  SFUNotAvailableError,
   Call,
   CallSession,
   CTIPhone,

package/src/simple/Phone.js

@@ -14,6 +14,7 @@ import IssueReporter from '../service/IssueReporter';
 import Emitter from '../utils/Emitter';
 
 import Wazo from './index';
+import SFUNotAvailableError from '../domain/SFUNotAvailableError';
 
 const logger = IssueReporter.loggerFor('simple-phone');
 const sipLogger = IssueReporter.loggerFor('sip.js');
@@ -397,7 +398,7 @@ class Phone extends Emitter {
 
   checkSfu() {
     if (!this.hasSfu()) {
-      throw new Error('Sorry your user is not configured to support video conference');
+      throw new SFUNotAvailableError();
     }
   }
 

package/src/simple/index.js

@@ -15,6 +15,7 @@ import { CanceledCallError } from '../web-rtc-client';
 
 import BadResponse from '../domain/BadResponse';
 import ServerError from '../domain/ServerError';
+import SFUNotAvailableError from '../domain/SFUNotAvailableError';
 import Call from '../domain/Call';
 import CallLog from '../domain/CallLog';
 import Recording from '../domain/Recording';
@@ -101,6 +102,7 @@ const Wazo = {
   InvalidSubscription,
   InvalidAuthorization,
   CanceledCallError,
+  SFUNotAvailableError,
 };
 
 if (window) {