@wazo/sdk 1.0.0-alpha.2 → 1.0.0-alpha.4

package/src/voice/call.ts

@@ -11,7 +11,8 @@ import type { IncomingRequestMessage } from 'sip.js/lib/core/messages/incoming-r
 import callStateMachine, { type ActionTypes, Actions, type EstablishedActionTypes, EstablishedActions, States, type StateTypes, EstablishedStates, type EstablishedStateTypes, type CallActorRef } from '../state-machine/call-state-machine';
 import { SipCall, PeerConnection } from '../domain/types';
 import ApiCall from '../domain/Call';
-
+import newFrom from '../utils/new-from';
+import updateFrom from '../utils/update-from';
 import IssueReporter from '../service/IssueReporter';
 import softphone, { EVENT_TERMINATE_SOUND, Softphone } from './softphone';
 import { getCallDisplayName, getCallNumber, getSipSessionId } from '../utils/sdp';
@@ -32,7 +33,8 @@ export type ReinviteOptions = {
 };
 
 // Events
-export const EVENT_CALL_ACCEPTED = 'accepted';
+export const EVENT_CALL_REMOTLY_ACCEPTED = 'remotelyAccepted';
+export const EVENT_CALL_LOCALLY_ACCEPTED = 'locallyAccepted';
 export const EVENT_CALL_CANCELED = 'canceled';
 export const EVENT_PROGRESS = 'progress';
 export const EVENT_EARLY_MEDIA = 'earlyMedia';
@@ -88,6 +90,10 @@ class Call extends EventEmitter {
 
   currentScreenShare: Record<string, any> | null;
 
+  static newFrom(call: Call) {
+    return newFrom(call, Call);
+  }
+
   static parseCall(apiCall: ApiCall): Call {
     const sipCall = {
       id: apiCall.sipCallId,
@@ -170,6 +176,8 @@ class Call extends EventEmitter {
     return this.phone.client.answer(this.sipCall as Invitation, options.withCamera).then(() => {
       logger.info('call - accepted', { id: this.id, ...options });
 
+      this.emit(EVENT_CALL_LOCALLY_ACCEPTED, this);
+
       return this.id;
     }).catch(e => {
       logger.error(e);
@@ -343,10 +351,26 @@ class Call extends EventEmitter {
     return this._hasEstablishedState(EstablishedStates.HELD);
   }
 
+  isEstablishing() {
+    return this.sipCall.state === SessionState.Establishing;
+  }
+
   isEstablished() {
     return States.ESTABLISHED in (this.state as Record<StateTypes, EstablishedStateTypes>);
   }
 
+  isRinging() {
+    return this.state === States.RINGING;
+  }
+
+  isOutgoing() {
+    return this.sipCall instanceof Invitation;
+  }
+
+  isIncoming() {
+    return !this.isOutgoing();
+  }
+
   isConference(): boolean {
     return (getPeerConnection(this.sipCall) as PeerConnection)?.sfu;
   }
@@ -355,7 +379,7 @@ class Call extends EventEmitter {
     assertState(this.callActor, States.ESTABLISHED);
     logger.info('call - transfer', { id: this.id, target });
 
-    this.phone.client.transfer(this.sipCall, target);
+    return this.phone.client.transfer(this.sipCall, target);
   }
 
   atxfer(): Record<string, any> | null | undefined {
@@ -528,7 +552,7 @@ class Call extends EventEmitter {
 
   onAccepted() {
     this._sendAction(Actions.REMOTLY_ACCEPTED);
-    this.emit(EVENT_CALL_ACCEPTED);
+    this.emit(EVENT_CALL_REMOTLY_ACCEPTED);
   }
 
   onProgress() {
@@ -595,14 +619,22 @@ class Call extends EventEmitter {
     return isVideoRemotelyHeld(this.sipCall);
   }
 
-  isRinging() {
-    return this.state === States.RINGING;
-  }
-
   onReinvite(request: IncomingRequestMessage, updatedCalleeName: string, updatedNumber: string, hadRemoteVideo: boolean) {
     this.emit(EVENT_REINVITE, request, updatedCalleeName, updatedNumber, hadRemoteVideo);
   }
 
+  updateFrom(call: Call) {
+    updateFrom(this, call);
+  }
+
+  is(otherCall: Call) {
+    return otherCall && this.id && this.id === otherCall.id;
+  }
+
+  shouldAutoAnswer() {
+    return !!this.sipCall.request.getHeader('alert-info');
+  }
+
   get id() {
     return getSipSessionId(this.sipCall);
   }
@@ -613,7 +645,7 @@ class Call extends EventEmitter {
 
   private _hasEstablishedState(establishedState: EstablishedStateTypes) {
     const state = this.state as Record<StateTypes, EstablishedStateTypes>;
-    return States.ESTABLISHED in state && state[States.ESTABLISHED] === establishedState;
+    return typeof state === 'object' && States.ESTABLISHED in state && state[States.ESTABLISHED] === establishedState;
   }
 
   private _bindEvents() {
@@ -630,7 +662,7 @@ class Call extends EventEmitter {
       };
     }
 
-    this.sipCall.stateChange.addListener((newState: SessionState) => {
+    this.sipCall?.stateChange?.addListener((newState: SessionState) => {
       switch (newState) {
         case SessionState.Terminating:
           logger.info('call - terminating', { id: this.id });

package/src/voice/softphone.ts

@@ -44,6 +44,7 @@ export type CallOptions = {
   // If audioOnly is set to true, all video stream will be deactivated, even remotes ones.
   audioOnly?: boolean,
   conference?: boolean,
+  extraHeaders?: Record<string, any>,
 };
 
 const logger = IssueReporter.loggerFor('softphone');
@@ -107,6 +108,10 @@ export class Softphone extends EventEmitter {
     return this.connectWithCredentials(server, this.sipLine, session.displayName(), options);
   }
 
+  async hangupAllCalls() {
+    return Promise.all(this.calls.map(call => call.hangup()));
+  }
+
   async disconnect() {
     assertCan(this.softphoneActor, Actions.UNREGISTER);
     if (!this.client) {
@@ -114,7 +119,7 @@ export class Softphone extends EventEmitter {
     }
 
     // Terminate all calls
-    await Promise.all(this.calls.map(call => call.hangup()));
+    await this.hangupAllCalls();
 
     return this.client.unregister();
   }
@@ -348,7 +353,11 @@ export class Softphone extends EventEmitter {
   }
 
   getCurrentCall(): Call | undefined {
-    return this.calls.find(call => call.isEstablished());
+    return this.getActiveCalls()[0];
+  }
+
+  getActiveCalls(): Call[] {
+    return this.calls.filter(call => call.isEstablished());
   }
 
   getIncomingCalls(): Call[] {
@@ -359,6 +368,10 @@ export class Softphone extends EventEmitter {
     return getState(this.softphoneActor) as StateTypes;
   }
 
+  get user() {
+    return this.client?.userAgent?.contact?.uri?.user;
+  }
+
   getUserAgent() {
     return this.client?.config?.userAgentString || 'softphone';
   }