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

package/esm/voice/softphone.js

@@ -9,6 +9,7 @@ import IssueReporter from '../service/IssueReporter';
 import configureLogger from '../utils/sip-logger';
 import Call from './call';
 import { assertCan, can, getState, waitUntilState } from '../state-machine/utils';
+import { getSipCallId } from '../utils/sdp';
 export const EVENT_INCOMING = 'incoming';
 export const EVENT_OUTGOING = 'outgoing';
 export const EVENT_HEARTBEAT = 'heartbeat';
@@ -53,6 +54,7 @@ export class Softphone extends EventEmitter {
         this.audioRingVolume = 1;
         const server = Wazo.Auth.getHost();
         const session = Wazo.Auth.getSession();
+        logger.info('softphone - connect', { server, session: !!session });
         if (!server || !session) {
             throw new Error('Please connect to the server using `Wazo.Auth.logIn` or `Wazo.Auth.authenticate` before using Room.connect().');
         }
@@ -64,21 +66,28 @@ export class Softphone extends EventEmitter {
         this.options.userUuid = session.uuid || '';
         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);
+        logger.info('softphone - disconnect');
         if (!this.client) {
+            logger.info('softphone - disconnect, not client to disconnect, bailing');
             return null;
         }
         // Terminate all calls
-        await Promise.all(this.calls.map(call => call.hangup()));
-        return this.client.unregister();
+        await this.hangupAllCalls();
+        await this.client.unregister();
+        return this.client.close();
     }
     getPrimaryWebRtcLine() {
         return this.session?.primaryWebRtcLine() || null;
     }
     async connectWithCredentials(server, sipLine, displayName, rawOptions = {}) {
         assertCan(this.softphoneActor, Actions.REGISTER);
-        this.softphoneActor.send({ type: Actions.REGISTER });
+        logger.info('softphone - connect with credentials', { server, username: sipLine.username, displayName, options: rawOptions });
+        this._sendAction(Actions.REGISTER);
         const [host, port = 443] = server.split(':');
         let options = { ...rawOptions };
         options.media = options.media || {
@@ -110,7 +119,7 @@ export class Softphone extends EventEmitter {
         if (!this.client) {
             return;
         }
-        this.client.attemptReconnection();
+        this.client.register();
     }
     async call(options) {
         logger.info('softphone - call', options);
@@ -122,7 +131,7 @@ export class Softphone extends EventEmitter {
             logger.info('softphone - calling when registering, waiting for Softphone to be registered ...');
             await waitUntilState(this.softphoneActor, States.REGISTERED);
         }
-        if (this.state !== States.UNREGISTERED) {
+        if (this.state !== States.REGISTERED) {
             throw new InvalidState(`Invalid state ${States.UNREGISTERED}`, States.UNREGISTERED);
         }
         // Hold other calls
@@ -131,6 +140,8 @@ export class Softphone extends EventEmitter {
         try {
             sipCall = this.client.call(options.params.To, options.withCamera, options.audioOnly, options.conference, options);
             const call = new Call(sipCall, this);
+            call.onMakeCall();
+            this.calls.push(call);
             this.emit(EVENT_OUTGOING, call);
             return call;
         }
@@ -195,10 +206,11 @@ export class Softphone extends EventEmitter {
         this.ringingEnabled = false;
     }
     holdAllCalls(exceptCall = null) {
-        this.calls.filter(call => !call.isHeld() && call.id === exceptCall?.id).forEach(call => call.hold());
+        logger.info('softphone - hold all calls', { exceptId: exceptCall?.id, ids: this.calls.map(call => call.id) });
+        this.calls.filter(call => !call.isHeld() && call.id !== exceptCall?.id).forEach(call => call.hold());
     }
     startHeartbeat() {
-        logger.info('softphone - start heartbeat', { client: !!this.client, hasHeartbeat: this.client.hasHeartbeat() });
+        logger.info('softphone - start heartbeat', { client: !!this.client, hasHeartbeat: this.client?.hasHeartbeat() });
         if (!this.client || this.client.hasHeartbeat()) {
             return;
         }
@@ -248,7 +260,10 @@ export class Softphone extends EventEmitter {
         this.audioRingVolume = volume;
     }
     getCurrentCall() {
-        return this.calls.find(call => call.isEstablished());
+        return this.getActiveCalls()[0];
+    }
+    getActiveCalls() {
+        return this.calls.filter(call => call.isEstablished());
     }
     getIncomingCalls() {
         return this.calls.filter(call => call.isRinging());
@@ -256,12 +271,21 @@ export class Softphone extends EventEmitter {
     get state() {
         return getState(this.softphoneActor);
     }
+    get user() {
+        return this.client?.userAgent?.contact?.uri?.user;
+    }
     getUserAgent() {
         return this.client?.config?.userAgentString || 'softphone';
     }
+    isRegistering() {
+        return this.state === States.REGISTERING;
+    }
     isRegistered() {
         return this.state === States.REGISTERED;
     }
+    isUnRegistered() {
+        return this.state === States.UNREGISTERED;
+    }
     _bindEvents() {
         this.client.on(this.client.INVITE, (sipSession) => {
             const call = new Call(sipSession, this);
@@ -280,7 +304,7 @@ export class Softphone extends EventEmitter {
         });
         this.client.on(this.client.ON_REINVITE, (sipCall, request, updatedCalleeName, updatedNumber, hadRemoteVideo) => {
             logger.info('softphone - on reinvite', {
-                callId: sipCall.id,
+                callId: getSipCallId(sipCall),
                 inviteId: request.callId,
                 updatedCalleeName,
                 updatedNumber,
@@ -320,18 +344,26 @@ export class Softphone extends EventEmitter {
         });
         this.client.on(this.client.UNREGISTERED, () => {
             logger.info('softphone - unregistered');
+            if (!can(this.softphoneActor, Actions.UNREGISTER)) {
+                logger.warn('softphone - cannot unregister', { state: this.state });
+                return;
+            }
+            this._sendAction(Actions.UNREGISTER);
             this.emit(EVENT_UNREGISTERED);
-            this._sendAction(Actions.UNREGISTERED);
         });
         this.client.on(this.client.ON_DISCONNECTED, () => {
             logger.info('softphone - disconnected');
-            this.emit(EVENT_DISCONNECTED);
+            if (!can(this.softphoneActor, Actions.TRANSPORT_CLOSED)) {
+                logger.warn('softphone - cannot disconnected', { state: this.state });
+                return;
+            }
             this._sendAction(Actions.TRANSPORT_CLOSED);
+            this.emit(EVENT_DISCONNECTED);
         });
         this.client.on(this.client.REGISTERED, () => {
-            logger.info('softphone - registered', { state: getState(this.softphoneActor) });
+            logger.info('softphone - registered', { state: getState(this.softphoneActor), reinvite: this.shouldSendReinvite });
             if (!can(this.softphoneActor, Actions.REGISTER_DONE)) {
-                logger.warn('softphone - registered but not in REGISTERING state', { state: getState(this.softphoneActor) });
+                logger.warn('softphone - registered but not in REGISTERING state', { state: this.state });
                 return;
             }
             this.stopHeartbeat();
@@ -347,9 +379,13 @@ export class Softphone extends EventEmitter {
             }
         });
         this.client.on(this.client.CONNECTED, () => {
-            logger.info('softphone - connected');
+            logger.info('softphone - connected', { state: this.state });
             this.stopHeartbeat();
         });
+        this.client.on(this.client.REGISTERING, () => {
+            logger.info('softphone - registering', { state: this.state });
+            this._sendAction(Actions.REGISTER);
+        });
         this.client.on(this.client.DISCONNECTED, () => {
             logger.info('softphone - disconnected');
             this.emit(EVENT_DISCONNECTED);
@@ -375,16 +411,21 @@ export class Softphone extends EventEmitter {
         });
     }
     _sendAction(action) {
+        const was = this.state;
         this.softphoneActor.send({ type: action });
+        logger.trace('softphone - send action', { action, was, state: this.state });
     }
     _getCall(sipCall) {
-        return this.calls.find(call => call.id === sipCall.id);
+        return this.calls.find(call => call.id === getSipCallId(sipCall));
+    }
+    _getCallIds() {
+        return this.calls.map(call => call.id);
     }
     _onCallEvent(sipCall, eventName, ...args) {
-        logger.warn('softphone - received call event', { eventName, sipId: sipCall.id });
+        logger.info('softphone - received call event', { eventName, sipId: getSipCallId(sipCall) });
         const call = this._getCall(sipCall);
         if (!call) {
-            logger.warn('softphone - no call found to send the event', { eventName, sipId: sipCall.id });
+            logger.warn('softphone - no call found to send the event', { eventName, sipId: getSipCallId(sipCall), ids: this._getCallIds() });
             return;
         }
         // @ts-ignore