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

package/lib/voice/softphone.js

@@ -47,6 +47,7 @@ const IssueReporter_1 = __importDefault(require("../service/IssueReporter"));
 const sip_logger_1 = __importDefault(require("../utils/sip-logger"));
 const call_1 = __importDefault(require("./call"));
 const utils_1 = require("../state-machine/utils");
+const sdp_1 = require("../utils/sdp");
 exports.EVENT_INCOMING = 'incoming';
 exports.EVENT_OUTGOING = 'outgoing';
 exports.EVENT_HEARTBEAT = 'heartbeat';
@@ -80,6 +81,7 @@ class Softphone extends events_1.EventEmitter {
         this.audioRingVolume = 1;
         const server = __1.default.Auth.getHost();
         const session = __1.default.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().');
         }
@@ -91,15 +93,23 @@ class Softphone extends events_1.EventEmitter {
         this.options.userUuid = session.uuid || '';
         return this.connectWithCredentials(server, this.sipLine, session.displayName(), options);
     }
+    hangupAllCalls() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return Promise.all(this.calls.map(call => call.hangup()));
+        });
+    }
     disconnect() {
         return __awaiter(this, void 0, void 0, function* () {
             (0, utils_1.assertCan)(this.softphoneActor, softphone_state_machine_1.Actions.UNREGISTER);
+            logger.info('softphone - disconnect');
             if (!this.client) {
+                logger.info('softphone - disconnect, not client to disconnect, bailing');
                 return null;
             }
             // Terminate all calls
-            yield Promise.all(this.calls.map(call => call.hangup()));
-            return this.client.unregister();
+            yield this.hangupAllCalls();
+            yield this.client.unregister();
+            return this.client.close();
         });
     }
     getPrimaryWebRtcLine() {
@@ -109,7 +119,8 @@ class Softphone extends events_1.EventEmitter {
     connectWithCredentials(server_1, sipLine_1, displayName_1) {
         return __awaiter(this, arguments, void 0, function* (server, sipLine, displayName, rawOptions = {}) {
             (0, utils_1.assertCan)(this.softphoneActor, softphone_state_machine_1.Actions.REGISTER);
-            this.softphoneActor.send({ type: softphone_state_machine_1.Actions.REGISTER });
+            logger.info('softphone - connect with credentials', { server, username: sipLine.username, displayName, options: rawOptions });
+            this._sendAction(softphone_state_machine_1.Actions.REGISTER);
             const [host, port = 443] = server.split(':');
             let options = Object.assign({}, rawOptions);
             options.media = options.media || {
@@ -134,7 +145,7 @@ class Softphone extends events_1.EventEmitter {
         if (!this.client) {
             return;
         }
-        this.client.attemptReconnection();
+        this.client.register();
     }
     call(options) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -147,7 +158,7 @@ class Softphone extends events_1.EventEmitter {
                 logger.info('softphone - calling when registering, waiting for Softphone to be registered ...');
                 yield (0, utils_1.waitUntilState)(this.softphoneActor, softphone_state_machine_1.States.REGISTERED);
             }
-            if (this.state !== softphone_state_machine_1.States.UNREGISTERED) {
+            if (this.state !== softphone_state_machine_1.States.REGISTERED) {
                 throw new InvalidState_1.default(`Invalid state ${softphone_state_machine_1.States.UNREGISTERED}`, softphone_state_machine_1.States.UNREGISTERED);
             }
             // Hold other calls
@@ -156,6 +167,8 @@ class Softphone extends events_1.EventEmitter {
             try {
                 sipCall = this.client.call(options.params.To, options.withCamera, options.audioOnly, options.conference, options);
                 const call = new call_1.default(sipCall, this);
+                call.onMakeCall();
+                this.calls.push(call);
                 this.emit(exports.EVENT_OUTGOING, call);
                 return call;
             }
@@ -221,10 +234,12 @@ class Softphone extends events_1.EventEmitter {
         this.ringingEnabled = false;
     }
     holdAllCalls(exceptCall = null) {
-        this.calls.filter(call => !call.isHeld() && call.id === (exceptCall === null || exceptCall === void 0 ? void 0 : exceptCall.id)).forEach(call => call.hold());
+        logger.info('softphone - hold all calls', { exceptId: exceptCall === null || exceptCall === void 0 ? void 0 : exceptCall.id, ids: this.calls.map(call => call.id) });
+        this.calls.filter(call => !call.isHeld() && call.id !== (exceptCall === null || exceptCall === void 0 ? void 0 : exceptCall.id)).forEach(call => call.hold());
     }
     startHeartbeat() {
-        logger.info('softphone - start heartbeat', { client: !!this.client, hasHeartbeat: this.client.hasHeartbeat() });
+        var _a;
+        logger.info('softphone - start heartbeat', { client: !!this.client, hasHeartbeat: (_a = this.client) === null || _a === void 0 ? void 0 : _a.hasHeartbeat() });
         if (!this.client || this.client.hasHeartbeat()) {
             return;
         }
@@ -275,7 +290,10 @@ class Softphone extends events_1.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());
@@ -283,13 +301,23 @@ class Softphone extends events_1.EventEmitter {
     get state() {
         return (0, utils_1.getState)(this.softphoneActor);
     }
+    get user() {
+        var _a, _b, _c, _d;
+        return (_d = (_c = (_b = (_a = this.client) === null || _a === void 0 ? void 0 : _a.userAgent) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.uri) === null || _d === void 0 ? void 0 : _d.user;
+    }
     getUserAgent() {
         var _a, _b;
         return ((_b = (_a = this.client) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.userAgentString) || 'softphone';
     }
+    isRegistering() {
+        return this.state === softphone_state_machine_1.States.REGISTERING;
+    }
     isRegistered() {
         return this.state === softphone_state_machine_1.States.REGISTERED;
     }
+    isUnRegistered() {
+        return this.state === softphone_state_machine_1.States.UNREGISTERED;
+    }
     _bindEvents() {
         this.client.on(this.client.INVITE, (sipSession) => {
             const call = new call_1.default(sipSession, this);
@@ -308,7 +336,7 @@ class Softphone extends events_1.EventEmitter {
         });
         this.client.on(this.client.ON_REINVITE, (sipCall, request, updatedCalleeName, updatedNumber, hadRemoteVideo) => {
             logger.info('softphone - on reinvite', {
-                callId: sipCall.id,
+                callId: (0, sdp_1.getSipCallId)(sipCall),
                 inviteId: request.callId,
                 updatedCalleeName,
                 updatedNumber,
@@ -348,18 +376,26 @@ class Softphone extends events_1.EventEmitter {
         });
         this.client.on(this.client.UNREGISTERED, () => {
             logger.info('softphone - unregistered');
+            if (!(0, utils_1.can)(this.softphoneActor, softphone_state_machine_1.Actions.UNREGISTER)) {
+                logger.warn('softphone - cannot unregister', { state: this.state });
+                return;
+            }
+            this._sendAction(softphone_state_machine_1.Actions.UNREGISTER);
             this.emit(exports.EVENT_UNREGISTERED);
-            this._sendAction(softphone_state_machine_1.Actions.UNREGISTERED);
         });
         this.client.on(this.client.ON_DISCONNECTED, () => {
             logger.info('softphone - disconnected');
-            this.emit(exports.EVENT_DISCONNECTED);
+            if (!(0, utils_1.can)(this.softphoneActor, softphone_state_machine_1.Actions.TRANSPORT_CLOSED)) {
+                logger.warn('softphone - cannot disconnected', { state: this.state });
+                return;
+            }
             this._sendAction(softphone_state_machine_1.Actions.TRANSPORT_CLOSED);
+            this.emit(exports.EVENT_DISCONNECTED);
         });
         this.client.on(this.client.REGISTERED, () => {
-            logger.info('softphone - registered', { state: (0, utils_1.getState)(this.softphoneActor) });
+            logger.info('softphone - registered', { state: (0, utils_1.getState)(this.softphoneActor), reinvite: this.shouldSendReinvite });
             if (!(0, utils_1.can)(this.softphoneActor, softphone_state_machine_1.Actions.REGISTER_DONE)) {
-                logger.warn('softphone - registered but not in REGISTERING state', { state: (0, utils_1.getState)(this.softphoneActor) });
+                logger.warn('softphone - registered but not in REGISTERING state', { state: this.state });
                 return;
             }
             this.stopHeartbeat();
@@ -375,9 +411,13 @@ class Softphone extends events_1.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(softphone_state_machine_1.Actions.REGISTER);
+        });
         this.client.on(this.client.DISCONNECTED, () => {
             logger.info('softphone - disconnected');
             this.emit(exports.EVENT_DISCONNECTED);
@@ -403,16 +443,21 @@ class Softphone extends events_1.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 === (0, sdp_1.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: (0, sdp_1.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: (0, sdp_1.getSipCallId)(sipCall), ids: this._getCallIds() });
             return;
         }
         // @ts-ignore