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

package/src/web-rtc-client.ts

@@ -39,6 +39,7 @@ const logger = IssueReporter ? IssueReporter.loggerFor('webrtc-client') : consol
 const statsLogger = IssueReporter ? IssueReporter.loggerFor('webrtc-stats') : console;
 // events
 const REGISTERED = 'registered';
+const REGISTERING = 'registering';
 const UNREGISTERED = 'unregistered';
 const REGISTRATION_FAILED = 'registrationFailed';
 const INVITE = 'invite';
@@ -57,7 +58,7 @@ const ON_SCREEN_SHARING_REINVITE = 'onScreenSharingReinvite';
 const ON_NETWORK_STATS = 'onNetworkStats';
 const ON_DISCONNECTED = 'onDisconnected';
 
-export const events = [REGISTERED, UNREGISTERED, REGISTRATION_FAILED, INVITE];
+export const events = [REGISTERED, REGISTERING, UNREGISTERED, REGISTRATION_FAILED, INVITE];
 export const transportEvents = [CONNECTED, DISCONNECTED, TRANSPORT_ERROR, MESSAGE];
 export class CanceledCallError extends Error {}
 
@@ -119,6 +120,8 @@ export default class WebRTCClient extends Emitter {
 
   REGISTERED: string;
 
+  REGISTERING: string;
+
   UNREGISTERED: string;
 
   REGISTRATION_FAILED: string;
@@ -196,6 +199,7 @@ export default class WebRTCClient extends Emitter {
     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;
@@ -241,7 +245,7 @@ export default class WebRTCClient extends Emitter {
         logger.info('sdk webrtc on invite', {
           method: 'delegate.onInvite',
           clientId: this.clientId,
-          id: invitation.id,
+          id: getSipCallId(invitation),
           remoteURI: (invitation as any).remoteURI,
         });
 
@@ -343,6 +347,8 @@ export default class WebRTCClient extends Emitter {
 
     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);
@@ -577,7 +583,7 @@ export default class WebRTCClient extends Emitter {
         },
         onReject: (response: IncomingResponse) => {
           logger.info('on call rejected', {
-            id: session?.id,
+            id: getSipCallId(session),
             // @ts-ignore: fromTag does not exist
             fromTag: session?.fromTag,
           });
@@ -614,7 +620,7 @@ export default class WebRTCClient extends Emitter {
   answer(session: Invitation, enableVideo?: boolean): Promise<void> {
     logger.info('sdk webrtc answer call', {
       clientId: this.clientId,
-      id: session.id,
+      id: getSipCallId(session),
       enableVideo,
     });
 
@@ -632,7 +638,7 @@ export default class WebRTCClient extends Emitter {
       if (session.isCanceled) {
         const message = 'accepted a canceled session (or was canceled during the accept phase).';
         logger.error(message, {
-          id: session.id,
+          id: getSipCallId(session),
         });
         this.onCallEnded(session);
         throw new CanceledCallError(message);
@@ -642,7 +648,7 @@ export default class WebRTCClient extends Emitter {
 
       this._onAccepted(session);
     }).catch(e => {
-      logger.error(`answer call error for ${session ? session.id : 'n/a'}`, e);
+      logger.error(`answer call error for ${getSipCallId(session)}`, e);
       throw e;
     });
   }
@@ -710,7 +716,7 @@ export default class WebRTCClient extends Emitter {
   async reject(session: WazoSession): Promise<void> {
     logger.info('sdk webrtc reject call', {
       clientId: this.clientId,
-      id: session.id,
+      id: getSipCallId(session),
     });
 
     try {
@@ -773,7 +779,7 @@ export default class WebRTCClient extends Emitter {
 
   mute(session: WazoSession): void {
     logger.info('sdk webrtc mute', {
-      id: session.id,
+      id: getSipCallId(session),
     });
 
     toggleAudio(session, true);
@@ -781,7 +787,7 @@ export default class WebRTCClient extends Emitter {
 
   unmute(session: WazoSession): void {
     logger.info('sdk webrtc unmute', {
-      id: session.id,
+      id: getSipCallId(session),
     });
 
     toggleAudio(session, false);
@@ -826,7 +832,7 @@ export default class WebRTCClient extends Emitter {
 
   toggleCameraOn(session: WazoSession): void {
     logger.info('sdk webrtc toggle camera on', {
-      id: session.id,
+      id: getSipCallId(session),
     });
 
     toggleVideo(session, false);
@@ -834,7 +840,7 @@ export default class WebRTCClient extends Emitter {
 
   toggleCameraOff(session: WazoSession): void {
     logger.info('sdk webrtc toggle camera off', {
-      id: session.id,
+      id: getSipCallId(session),
     });
 
     toggleVideo(session, true);
@@ -1035,7 +1041,7 @@ export default class WebRTCClient extends Emitter {
     }
 
     logger.info('send WebRTC message', {
-      sipId: sipSession.id,
+      sipId: getSipCallId(sipSession),
       contentType,
     });
 
@@ -1492,7 +1498,7 @@ export default class WebRTCClient extends Emitter {
   }
 
   getSipSession(id: string): WazoSession | null | undefined {
-    return id in this.sipSessions ? this.sipSessions[id.substring(0, SIP_ID_MIN_LENGTH)] : null;
+    return id in this.sipSessions ? this.sipSessions[id] : null;
   }
 
   getSipCallIds(): string[] {
@@ -1547,8 +1553,8 @@ export default class WebRTCClient extends Emitter {
     return audio;
   }
 
-  _onTransportError(): void {
-    logger.error('on transport error');
+  _onTransportError(reason?: string): void {
+    logger.warn('on transport error', { reason });
     this.eventEmitter.emit(TRANSPORT_ERROR);
     this.attemptReconnection();
   }
@@ -1610,7 +1616,7 @@ export default class WebRTCClient extends Emitter {
       }
 
       // 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');
     }
   }
 
@@ -1763,18 +1769,17 @@ export default class WebRTCClient extends Emitter {
   async _onProgress(session: WazoSession, early = false): Promise<void> {
     await this._setupMedias(session);
 
-    const sessionId = getSipCallId(session).substr(0, 20);
+    const sessionId = getSipCallId(session);
+
     updateRemoteStream(session);
-    logger.info('progress received', {
-      sessionId,
-      early,
-    });
+
+    logger.info('progress received', { sessionId, early });
     this.eventEmitter.emit(early ? ON_EARLY_MEDIA : ON_PROGRESS, session);
   }
 
   async _onAccepted(session: WazoSession, sessionDialog?: SessionDialog, withEvent = true, initAllTracks = true): Promise<void> {
     logger.info('on call accepted', {
-      id: session.id,
+      id: getSipCallId(session),
       clientId: this.clientId,
       remoteTag: session.remoteTag,
     });
@@ -2012,20 +2017,20 @@ export default class WebRTCClient extends Emitter {
   async _accept(session: Invitation, options: InvitationAcceptOptions = {}) {
     if (session.state === SessionState.Terminated || session.state === 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: getSipCallId(session) });
       throw new Error(error);
     }
 
     if (session.state !== 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: 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: getSipCallId(session) });
       throw new Error(error);
     }
 
@@ -2038,13 +2043,13 @@ export default class WebRTCClient extends Emitter {
 
   async _reject(session: Invitation, options: InvitationRejectOptions = {}) {
     if (session.state !== SessionState.Initial && session.state !== 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: 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: getSipCallId(session) });
       return;
     }
 
@@ -2057,7 +2062,7 @@ export default class WebRTCClient extends Emitter {
 
   async _cancel(session: Inviter, options: InviterCancelOptions = {}) {
     if (session.state !== SessionState.Initial && session.state !== 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: getSipCallId(session) });
       return;
     }
 
@@ -2070,7 +2075,7 @@ export default class WebRTCClient extends Emitter {
 
   async _bye(session: WazoSession, options: SessionByeOptions = {}) {
     if (session.state !== 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: getSipCallId(session) });
       return null;
     }