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

package/src/voice/softphone.ts

@@ -93,6 +93,8 @@ export class Softphone extends EventEmitter {
     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().');
     }
@@ -116,6 +118,7 @@ export class Softphone extends EventEmitter {
   async disconnect() {
     assertCan(this.softphoneActor, Actions.UNREGISTER);
     if (!this.client) {
+      logger.info('softphone - disconnect, not client to disconnect, bailing');
       return null;
     }
 
@@ -137,7 +140,9 @@ export class Softphone extends EventEmitter {
   ): Promise<void> {
     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 };
@@ -291,7 +296,7 @@ export class Softphone extends EventEmitter {
   }
 
   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;
     }
@@ -456,22 +461,32 @@ export class Softphone extends EventEmitter {
 
     this.client.on(this.client.UNREGISTERED, () => {
       logger.info('softphone - unregistered');
-      this.emit(EVENT_UNREGISTERED);
+      if (!can(this.softphoneActor, Actions.UNREGISTER)) {
+        logger.warn('softphone - cannot unregister', { state: this.state });
+        return;
+      }
+
+      this._sendAction(Actions.UNREGISTER);
 
-      this._sendAction(Actions.UNREGISTERED);
+      this.emit(EVENT_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) });
       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;
       }
 
@@ -492,10 +507,16 @@ 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);
@@ -529,7 +550,9 @@ export class Softphone extends EventEmitter {
   }
 
   private _sendAction(action: ActionTypes) {
+    const was = this.state;
     this.softphoneActor.send({ type: action });
+    logger.trace('softphone - send action', { action, was, state: this.state });
   }
 
   private _getCall(sipCall: SipCall): Call | undefined {

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;
@@ -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);
@@ -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');
     }
   }