@wazo/sdk 0.37.28 → 0.37.32

package/src/web-rtc-client.js

@@ -87,6 +87,7 @@ type WebRtcConfig = {
   displayName: string,
   host: string,
   port?: number,
+  websocketSip?: ?string,
   authorizationUser: ?string,
   password: ?string,
   uri: string,
@@ -128,6 +129,7 @@ export default class WebRTCClient extends Emitter {
   skipRegister: boolean;
   networkMonitoringInterval: { [string]: IntervalID };
   sessionNetworkStats: { [string]: Object };
+  forceClosed: boolean;
 
   // sugar
   ON_USER_AGENT: string;
@@ -190,6 +192,7 @@ export default class WebRTCClient extends Emitter {
     this.conferences = {};
     this.networkMonitoringInterval = {};
     this.sessionNetworkStats = {};
+    this.forceClosed = false;
 
     this._boundOnHeartbeat = this._onHeartbeat.bind(this);
     this.heartbeat = new Heartbeat(config.heartbeatDelay, config.heartbeatTimeout, config.maxHeartbeats);
@@ -311,6 +314,8 @@ export default class WebRTCClient extends Emitter {
       skipRegister: this.skipRegister,
     };
 
+    this.forceClosed = false;
+
     if (this.skipRegister) {
       logger.info('sdk webrtc skip register...', logInfo);
       return Promise.resolve();
@@ -335,7 +340,15 @@ export default class WebRTCClient extends Emitter {
     const registerOptions = this._isWeb() ? {} : { extraContactHeaderParams: ['mobility=mobile'] };
 
     const onRegisterFailed = () => {
-      logger.info('sdk webrtc registering failed', { tries, registerer: !!this.registerer });
+      logger.info('sdk webrtc registering failed', {
+        tries,
+        registerer: !!this.registerer,
+        forceClosed: this.forceClosed,
+      });
+      if (this.forceClosed) {
+        return;
+      }
+
       this.connectionPromise = null;
       if (this.registerer && this.registerer.waiting) {
         this.registerer.waitingToggle(false);
@@ -613,8 +626,9 @@ export default class WebRTCClient extends Emitter {
     }
   }
 
-  async close() {
-    logger.info('sdk webrtc closing client', { userAgent: !!this.userAgent });
+  async close(force: boolean = false) {
+    logger.info('sdk webrtc closing client', { userAgent: !!this.userAgent, force });
+    this.forceClosed = force;
     this._cleanupMedia();
     this.connectionPromise = null;
 
@@ -633,7 +647,7 @@ export default class WebRTCClient extends Emitter {
     this.userAgent.delegate = null;
     this.userAgent.stateChange.removeAllListeners();
 
-    await this._disconnectTransport();
+    await this._disconnectTransport(force);
 
     this._cleanupRegister();
 
@@ -1703,6 +1717,13 @@ export default class WebRTCClient extends Emitter {
   }
 
   _createWebRTCConfiguration(configOverrides: Object = {}) {
+    let { host } = this.config;
+    let port = this.config.port || 443;
+
+    if (this.config.websocketSip) {
+      [host, port = 443] = this.config.websocketSip.split(':');
+    }
+
     const config: Object = {
       authorizationUsername: this.config.authorizationUser,
       authorizationPassword: this.config.password,
@@ -1738,7 +1759,7 @@ export default class WebRTCClient extends Emitter {
       },
       transportOptions: {
         traceSip: configOverrides.traceSip || false,
-        wsServers: `wss://${this.config.host}:${this.config.port || 443}/api/asterisk/ws`,
+        wsServers: `wss://${host}:${port}/api/asterisk/ws`,
       },
       sessionDescriptionHandlerFactoryOptions: {
         modifiers: [replaceLocalIpModifier],
@@ -2062,7 +2083,15 @@ export default class WebRTCClient extends Emitter {
     return UserAgent.makeURI(`sip:${target}@${this.config.host}`);
   }
 
-  async _disconnectTransport() {
+  async _disconnectTransport(force: boolean = false) {
+    if (force) {
+      // Bypass sip.js state machine that prevent to close WS with the state `Connecting`
+      this.userAgent.transport.disconnectResolve = () => {};
+      // eslint-disable-next-line
+      this.userAgent.transport._ws.close(1000);
+      return;
+    }
+
     // Check if `disconnectPromise` is not present to avoid `Disconnect promise must not be defined` errors.
     if (this.userAgent && this.userAgent.transport && !this.userAgent.transport.disconnectPromise) {
       try {