@wazo/sdk 1.0.0-alpha.7 → 1.0.0-alpha.9

package/lib/utils/sdp.js

@@ -121,18 +121,19 @@ const getSipCallId = (sipSession) => {
     if (!sipSession) {
         return '';
     }
-    const message = sipSession.message;
-    if (message === null || message === void 0 ? void 0 : message.callId) {
-        return message.callId.substring(0, exports.SIP_ID_MIN_LENGTH);
-    }
     // For Inviter
     // @ts-ignore: private
     if (sipSession instanceof api_1.Inviter && sipSession.outgoingRequestMessage) {
         // @ts-ignore: private
-        return sipSession.outgoingRequestMessage.callId.substring(0, exports.SIP_ID_MIN_LENGTH);
+        return sipSession.outgoingRequestMessage.callId;
     }
     // For Invitation
-    return (sipSession.id || '').substring(0, exports.SIP_ID_MIN_LENGTH);
+    // @ts-ignore: private
+    if (sipSession instanceof api_1.Invitation && sipSession.incomingInviteRequest.message) {
+        // @ts-ignore: private
+        return sipSession.incomingInviteRequest.message.callId;
+    }
+    return sipSession.id;
 };
 exports.getSipCallId = getSipCallId;
 // We need to replace 0.0.0.0 to 127.0.0.1 in the sdp to avoid MOH during a createOffer.

package/lib/voice/call.js

@@ -103,7 +103,6 @@ class Call extends events_1.EventEmitter {
             },
         };
         const call = new Call(sipCall, softphone_1.default);
-        // call._sendAction(Actions.ES);
         call.apiId = apiCall.id;
         call.answerTime = new Date(+apiCall.startingTime);
         // Update call state
@@ -135,7 +134,6 @@ class Call extends events_1.EventEmitter {
         this.sipCall = sipCall;
         this.number = (0, sdp_1.getCallNumber)(sipCall);
         this.displayName = (0, sdp_1.getCallDisplayName)(sipCall);
-        this._bindEvents();
     }
     accept() {
         return __awaiter(this, arguments, void 0, function* (options = {}) {
@@ -447,6 +445,7 @@ class Call extends events_1.EventEmitter {
         this._onScreenSharing(localStream, false, desktop);
     }
     onMakeCall() {
+        this._bindEvents();
         this._sendAction(call_state_machine_1.Actions.MAKE_CALL);
     }
     onAccepted() {
@@ -660,7 +659,9 @@ class Call extends events_1.EventEmitter {
         this.emit(exports.EVENT_SHARE_SCREEN_STARTED, screenStream);
     }
     _sendAction(action) {
+        const was = this.state;
         this.callActor.send({ type: action });
+        logger.trace('call - send action', { action, was, state: this.state });
     }
 }
 exports.default = Call;

package/lib/voice/softphone.js

@@ -81,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().');
         }
@@ -101,6 +102,7 @@ class Softphone extends events_1.EventEmitter {
         return __awaiter(this, void 0, void 0, function* () {
             (0, utils_1.assertCan)(this.softphoneActor, softphone_state_machine_1.Actions.UNREGISTER);
             if (!this.client) {
+                logger.info('softphone - disconnect, not client to disconnect, bailing');
                 return null;
             }
             // Terminate all calls
@@ -115,7 +117,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 || {
@@ -232,7 +235,8 @@ class Softphone extends events_1.EventEmitter {
         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;
         }
@@ -363,18 +367,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) });
             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();
@@ -390,9 +402,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);
@@ -418,7 +434,9 @@ 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 === (0, sdp_1.getSipCallId)(sipCall));

package/lib/web-rtc-client.js

@@ -51,6 +51,7 @@ const logger = IssueReporter_1.default ? IssueReporter_1.default.loggerFor('webr
 const statsLogger = IssueReporter_1.default ? IssueReporter_1.default.loggerFor('webrtc-stats') : console;
 // events
 const REGISTERED = 'registered';
+const REGISTERING = 'registering';
 const UNREGISTERED = 'unregistered';
 const REGISTRATION_FAILED = 'registrationFailed';
 const INVITE = 'invite';
@@ -68,7 +69,7 @@ const ON_ERROR = 'onError';
 const ON_SCREEN_SHARING_REINVITE = 'onScreenSharingReinvite';
 const ON_NETWORK_STATS = 'onNetworkStats';
 const ON_DISCONNECTED = 'onDisconnected';
-exports.events = [REGISTERED, UNREGISTERED, REGISTRATION_FAILED, INVITE];
+exports.events = [REGISTERED, REGISTERING, UNREGISTERED, REGISTRATION_FAILED, INVITE];
 exports.transportEvents = [CONNECTED, DISCONNECTED, TRANSPORT_ERROR, MESSAGE];
 class CanceledCallError extends Error {
 }
@@ -112,6 +113,7 @@ class WebRTCClient extends Emitter_1.default {
         this.heartbeat.setOnHeartbeatTimeout(this._onHeartbeatTimeout.bind(this));
         // sugar
         this.REGISTERED = REGISTERED;
+        this.REGISTERING = REGISTERING;
         this.UNREGISTERED = UNREGISTERED;
         this.REGISTRATION_FAILED = REGISTRATION_FAILED;
         this.INVITE = INVITE;
@@ -153,7 +155,7 @@ class WebRTCClient extends Emitter_1.default {
                 logger.info('sdk webrtc on invite', {
                     method: 'delegate.onInvite',
                     clientId: this.clientId,
-                    id: invitation.id,
+                    id: (0, sdp_1.getSipCallId)(invitation),
                     remoteURI: invitation.remoteURI,
                 });
                 this._setupSession(invitation);
@@ -244,6 +246,7 @@ class WebRTCClient extends Emitter_1.default {
                 return Promise.resolve();
             }
             logger.info('sdk webrtc registering...', logInfo);
+            this.eventEmitter.emit(REGISTERING);
             if (!this.userAgent) {
                 logger.info('sdk webrtc recreating User Agent');
                 this.userAgent = this.createUserAgent(this.uaConfigOverrides);
@@ -443,7 +446,7 @@ class WebRTCClient extends Emitter_1.default {
                 },
                 onReject: (response) => {
                     logger.info('on call rejected', {
-                        id: session === null || session === void 0 ? void 0 : session.id,
+                        id: (0, sdp_1.getSipCallId)(session),
                         // @ts-ignore: fromTag does not exist
                         fromTag: session === null || session === void 0 ? void 0 : session.fromTag,
                     });
@@ -473,7 +476,7 @@ class WebRTCClient extends Emitter_1.default {
     answer(session, enableVideo) {
         logger.info('sdk webrtc answer call', {
             clientId: this.clientId,
-            id: session.id,
+            id: (0, sdp_1.getSipCallId)(session),
             enableVideo,
         });
         if (!session || !session.accept) {
@@ -489,7 +492,7 @@ class WebRTCClient extends Emitter_1.default {
             if (session.isCanceled) {
                 const message = 'accepted a canceled session (or was canceled during the accept phase).';
                 logger.error(message, {
-                    id: session.id,
+                    id: (0, sdp_1.getSipCallId)(session),
                 });
                 this.onCallEnded(session);
                 throw new CanceledCallError(message);
@@ -497,7 +500,7 @@ class WebRTCClient extends Emitter_1.default {
             logger.info('sdk webrtc answer, accepted.');
             this._onAccepted(session);
         }).catch(e => {
-            logger.error(`answer call error for ${session ? session.id : 'n/a'}`, e);
+            logger.error(`answer call error for ${(0, sdp_1.getSipCallId)(session)}`, e);
             throw e;
         });
     }
@@ -557,7 +560,7 @@ class WebRTCClient extends Emitter_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             logger.info('sdk webrtc reject call', {
                 clientId: this.clientId,
-                id: session.id,
+                id: (0, sdp_1.getSipCallId)(session),
             });
             try {
                 if (session instanceof api_1.Invitation) {
@@ -614,13 +617,13 @@ class WebRTCClient extends Emitter_1.default {
     }
     mute(session) {
         logger.info('sdk webrtc mute', {
-            id: session.id,
+            id: (0, sdp_1.getSipCallId)(session),
         });
         (0, webrtc_1.toggleAudio)(session, true);
     }
     unmute(session) {
         logger.info('sdk webrtc unmute', {
-            id: session.id,
+            id: (0, sdp_1.getSipCallId)(session),
         });
         (0, webrtc_1.toggleAudio)(session, false);
     }
@@ -657,13 +660,13 @@ class WebRTCClient extends Emitter_1.default {
     }
     toggleCameraOn(session) {
         logger.info('sdk webrtc toggle camera on', {
-            id: session.id,
+            id: (0, sdp_1.getSipCallId)(session),
         });
         (0, webrtc_1.toggleVideo)(session, false);
     }
     toggleCameraOff(session) {
         logger.info('sdk webrtc toggle camera off', {
-            id: session.id,
+            id: (0, sdp_1.getSipCallId)(session),
         });
         (0, webrtc_1.toggleVideo)(session, true);
     }
@@ -837,7 +840,7 @@ class WebRTCClient extends Emitter_1.default {
             return;
         }
         logger.info('send WebRTC message', {
-            sipId: sipSession.id,
+            sipId: (0, sdp_1.getSipCallId)(sipSession),
             contentType,
         });
         try {
@@ -1220,7 +1223,7 @@ class WebRTCClient extends Emitter_1.default {
         this.sipSessions[id] = session;
     }
     getSipSession(id) {
-        return id in this.sipSessions ? this.sipSessions[id.substring(0, sdp_1.SIP_ID_MIN_LENGTH)] : null;
+        return id in this.sipSessions ? this.sipSessions[id] : null;
     }
     getSipCallIds() {
         return Object.keys(this.sipSessions);
@@ -1265,8 +1268,8 @@ class WebRTCClient extends Emitter_1.default {
             return audio;
         });
     }
-    _onTransportError() {
-        logger.error('on transport error');
+    _onTransportError(reason) {
+        logger.warn('on transport error', { reason });
         this.eventEmitter.emit(TRANSPORT_ERROR);
         this.attemptReconnection();
     }
@@ -1321,7 +1324,7 @@ class WebRTCClient extends Emitter_1.default {
                     }
                 }
                 // We can invoke disconnect() with an error that can be catcher by `onDisconnect`, so we have to trigger it here.
-                this._onTransportError();
+                this._onTransportError('heartbeat timeout');
             }
         });
     }
@@ -1443,19 +1446,16 @@ class WebRTCClient extends Emitter_1.default {
     _onProgress(session_1) {
         return __awaiter(this, arguments, void 0, function* (session, early = false) {
             yield this._setupMedias(session);
-            const sessionId = (0, sdp_1.getSipCallId)(session).substr(0, 20);
+            const sessionId = (0, sdp_1.getSipCallId)(session);
             (0, webrtc_1.updateRemoteStream)(session);
-            logger.info('progress received', {
-                sessionId,
-                early,
-            });
+            logger.info('progress received', { sessionId, early });
             this.eventEmitter.emit(early ? ON_EARLY_MEDIA : ON_PROGRESS, session);
         });
     }
     _onAccepted(session_1, sessionDialog_1) {
         return __awaiter(this, arguments, void 0, function* (session, sessionDialog, withEvent = true, initAllTracks = true) {
             logger.info('on call accepted', {
-                id: session.id,
+                id: (0, sdp_1.getSipCallId)(session),
                 clientId: this.clientId,
                 remoteTag: session.remoteTag,
             });
@@ -1651,18 +1651,18 @@ class WebRTCClient extends Emitter_1.default {
         return __awaiter(this, arguments, void 0, function* (session, options = {}) {
             if (session.state === session_state_1.SessionState.Terminated || session.state === session_state_1.SessionState.Terminating) {
                 const error = 'Trying to accept a terminated sipSession.';
-                logger.warn(error, { state: session.state, sessionId: session.id });
+                logger.warn(error, { state: session.state, sessionId: (0, sdp_1.getSipCallId)(session) });
                 throw new Error(error);
             }
             if (session.state !== session_state_1.SessionState.Initial) {
                 const error = 'Trying to accept a non Initial sipSession.';
-                logger.warn(error, { state: session.state, sessionId: session.id });
+                logger.warn(error, { state: session.state, sessionId: (0, sdp_1.getSipCallId)(session) });
                 throw new Error(error);
             }
             // @ts-ignore: private
             if (!session.incomingInviteRequest.acceptable) {
                 const error = 'Trying to reject a non `acceptable` session';
-                logger.warn(error, { state: session.state, sessionId: session.id });
+                logger.warn(error, { state: session.state, sessionId: (0, sdp_1.getSipCallId)(session) });
                 throw new Error(error);
             }
             try {
@@ -1676,12 +1676,12 @@ class WebRTCClient extends Emitter_1.default {
     _reject(session_1) {
         return __awaiter(this, arguments, void 0, function* (session, options = {}) {
             if (session.state !== session_state_1.SessionState.Initial && session.state !== session_state_1.SessionState.Establishing) {
-                logger.warn('Trying to reject a session in a wrong state', { state: session.state, sessionId: session.id });
+                logger.warn('Trying to reject a session in a wrong state', { state: session.state, sessionId: (0, sdp_1.getSipCallId)(session) });
                 return;
             }
             // @ts-ignore: private
             if (!session.incomingInviteRequest.rejectable) {
-                logger.warn('Trying to reject a non `rejectable` session', { state: session.state, sessionId: session.id });
+                logger.warn('Trying to reject a non `rejectable` session', { state: session.state, sessionId: (0, sdp_1.getSipCallId)(session) });
                 return;
             }
             try {
@@ -1695,7 +1695,7 @@ class WebRTCClient extends Emitter_1.default {
     _cancel(session_1) {
         return __awaiter(this, arguments, void 0, function* (session, options = {}) {
             if (session.state !== session_state_1.SessionState.Initial && session.state !== session_state_1.SessionState.Establishing) {
-                logger.warn('Trying to cancel a session in a wrong state', { state: session.state, sessionId: session.id });
+                logger.warn('Trying to cancel a session in a wrong state', { state: session.state, sessionId: (0, sdp_1.getSipCallId)(session) });
                 return;
             }
             try {
@@ -1709,7 +1709,7 @@ class WebRTCClient extends Emitter_1.default {
     _bye(session_1) {
         return __awaiter(this, arguments, void 0, function* (session, options = {}) {
             if (session.state !== session_state_1.SessionState.Established) {
-                logger.warn('Trying to end a session in a wrong state', { state: session.state, sessionId: session.id });
+                logger.warn('Trying to end a session in a wrong state', { state: session.state, sessionId: (0, sdp_1.getSipCallId)(session) });
                 return null;
             }
             try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wazo/sdk",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0-alpha.9",
   "description": "Wazo's JavaScript Software Development Kit.",
   "main": "index.js",
   "types": "lib/types/index.d.ts",

package/src/api/auth.ts

@@ -33,6 +33,7 @@ export interface AuthD {
   logIn(params: LoginParams): Promise<Session | null | undefined> ;
   logOut: (token: Token) => Promise<LogoutResponse>;
   samlLogIn: (samlSessionId: string) => Promise<Session | null | undefined>;
+  samlLogOut: () => Promise<void | { location:string }>;
   initiateIdpAuthentication(domain: string, redirectUrl: string): Promise<any>;
   refreshToken: (refreshToken: string, backend: string, expiration: number, isMobile?: boolean, tenantId?: string, domainName?: string) => Promise<Session | null | undefined>;
   deleteRefreshToken: (clientId: string) => Promise<boolean>;
@@ -139,6 +140,10 @@ export default ((client: ApiRequester, baseUrl: string): AuthD => ({
     return client.post(`${baseUrl}/token`, body, headers).then(Session.parse);
   },
 
+  samlLogOut() {
+    return client.get(`${baseUrl}/saml/logout`, null, null);
+  },
+
   initiateIdpAuthentication: async (domain: string, redirectUrl: string) => {
     const body = {
       domain,

package/src/domain/CallLog.ts

@@ -118,8 +118,7 @@ export default class CallLog {
 
   static parseNew(plain: CallLogResponse, session: Session): CallLog {
     const callLog: CallLog = CallLog.parse(plain);
-    // @TODO: FIXME add verification declined vs missed call
-    callLog.newMissedCall = session && session.hasExtension((plain.requested_extension || plain.destination_extension) as string) && !plain.answered;
+    callLog.newMissedCall = session && plain.destination_user_uuid === session.uuid && !plain.answered;
     return callLog;
   }
 
@@ -203,7 +202,7 @@ export default class CallLog {
   }
 
   isAnOutgoingCall(session: Session): boolean {
-    console.warn(`@wazo/sdk 
+    console.warn(`@wazo/sdk
       CallLog.isAnOutgoingcall(session) method is obsolete.
       Please use CallLog.isOutgoing(session).
     `);