@wazo/sdk 0.37.31 → 0.37.32

package/lib/simple/utils.js

@@ -4854,6 +4854,34 @@ var chatdMethods = (client              , baseUrl        ) => ({
     client.get(`${baseUrl}/users/me/rooms/messages`, options),
 });
 
+//      
+
+                                     
+               
+  
+
+class MeetingStatus {
+               
+
+                
+
+  constructor({
+    full,
+  }         = {}) {
+    this.full = full;
+
+    // Useful to compare instead of instanceof with minified code
+    this.type = 'MeetingStatus';
+  }
+
+  static parse(plain                       )                {
+    return new MeetingStatus({
+      full: plain.full,
+    });
+  }
+
+}
+
 /*       */
 
                   
@@ -5048,6 +5076,8 @@ var calldMethods = (client              , baseUrl        ) => ({
     client.put(`${baseUrl}/users/me/calls/${callId}/record/resume`, null, null,
       ApiRequester.successResponseParser),
 
+  guestGetMeetingStatus: (meetingUuid        )                         =>
+    client.get(`${baseUrl}/guests/me/meetings/${meetingUuid}/status`).then(MeetingStatus.parse),
 });
 
 //      
@@ -6691,6 +6721,7 @@ class WebRTCClient extends Emitter {
                         
                                                       
                                             
+                       
 
   // sugar
                         
@@ -6753,6 +6784,7 @@ 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);
@@ -6874,6 +6906,8 @@ class WebRTCClient extends Emitter {
       skipRegister: this.skipRegister,
     };
 
+    this.forceClosed = false;
+
     if (this.skipRegister) {
       logger$8.info('sdk webrtc skip register...', logInfo);
       return Promise.resolve();
@@ -6898,7 +6932,15 @@ class WebRTCClient extends Emitter {
     const registerOptions = this._isWeb() ? {} : { extraContactHeaderParams: ['mobility=mobile'] };
 
     const onRegisterFailed = () => {
-      logger$8.info('sdk webrtc registering failed', { tries, registerer: !!this.registerer });
+      logger$8.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);
@@ -7176,8 +7218,9 @@ class WebRTCClient extends Emitter {
     }
   }
 
-  async close() {
-    logger$8.info('sdk webrtc closing client', { userAgent: !!this.userAgent });
+  async close(force          = false) {
+    logger$8.info('sdk webrtc closing client', { userAgent: !!this.userAgent, force });
+    this.forceClosed = force;
     this._cleanupMedia();
     this.connectionPromise = null;
 
@@ -7196,7 +7239,7 @@ class WebRTCClient extends Emitter {
     this.userAgent.delegate = null;
     this.userAgent.stateChange.removeAllListeners();
 
-    await this._disconnectTransport();
+    await this._disconnectTransport(force);
 
     this._cleanupRegister();
 
@@ -8632,7 +8675,15 @@ class WebRTCClient extends Emitter {
     return userAgent.UserAgent.makeURI(`sip:${target}@${this.config.host}`);
   }
 
-  async _disconnectTransport() {
+  async _disconnectTransport(force          = 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 {
@@ -10039,7 +10090,7 @@ class WebRTCPhone extends Emitter                  {
     return this.client && this.client.isConference(callSession.sipCallId);
   }
 
-  async close()                {
+  async close(force          = false)                {
     logger$7.info('WebRTC close');
 
     try {
@@ -10051,7 +10102,7 @@ class WebRTCPhone extends Emitter                  {
       logger$7.error('WebRTC close, unregister error', e);
     }
 
-    this.client.close();
+    this.client.close(force);
     this.unbind();
 
     this.incomingSessions = [];

package/lib/web-rtc-client.js

@@ -4590,6 +4590,34 @@ var chatdMethods = (client              , baseUrl        ) => ({
     client.get(`${baseUrl}/users/me/rooms/messages`, options),
 });
 
+//      
+
+                                     
+               
+  
+
+class MeetingStatus {
+               
+
+                
+
+  constructor({
+    full,
+  }         = {}) {
+    this.full = full;
+
+    // Useful to compare instead of instanceof with minified code
+    this.type = 'MeetingStatus';
+  }
+
+  static parse(plain                       )                {
+    return new MeetingStatus({
+      full: plain.full,
+    });
+  }
+
+}
+
 /*       */
 
                   
@@ -4784,6 +4812,8 @@ var calldMethods = (client              , baseUrl        ) => ({
     client.put(`${baseUrl}/users/me/calls/${callId}/record/resume`, null, null,
       ApiRequester.successResponseParser),
 
+  guestGetMeetingStatus: (meetingUuid        )                         =>
+    client.get(`${baseUrl}/guests/me/meetings/${meetingUuid}/status`).then(MeetingStatus.parse),
 });
 
 //      
@@ -5400,6 +5430,7 @@ class WebRTCClient extends Emitter {
                         
                                                       
                                             
+                       
 
   // sugar
                         
@@ -5462,6 +5493,7 @@ 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);
@@ -5583,6 +5615,8 @@ class WebRTCClient extends Emitter {
       skipRegister: this.skipRegister,
     };
 
+    this.forceClosed = false;
+
     if (this.skipRegister) {
       logger.info('sdk webrtc skip register...', logInfo);
       return Promise.resolve();
@@ -5607,7 +5641,15 @@ 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);
@@ -5885,8 +5927,9 @@ class WebRTCClient extends Emitter {
     }
   }
 
-  async close() {
-    logger.info('sdk webrtc closing client', { userAgent: !!this.userAgent });
+  async close(force          = false) {
+    logger.info('sdk webrtc closing client', { userAgent: !!this.userAgent, force });
+    this.forceClosed = force;
     this._cleanupMedia();
     this.connectionPromise = null;
 
@@ -5905,7 +5948,7 @@ class WebRTCClient extends Emitter {
     this.userAgent.delegate = null;
     this.userAgent.stateChange.removeAllListeners();
 
-    await this._disconnectTransport();
+    await this._disconnectTransport(force);
 
     this._cleanupRegister();
 
@@ -7341,7 +7384,15 @@ class WebRTCClient extends Emitter {
     return userAgent.UserAgent.makeURI(`sip:${target}@${this.config.host}`);
   }
 
-  async _disconnectTransport() {
+  async _disconnectTransport(force          = 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 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wazo/sdk",
-  "version": "0.37.31",
+  "version": "0.37.32",
   "description": "Wazo's JavaScript Software Development Kit.",
   "main": "dist/wazo-sdk.js",
   "author": "Wazo (http://wazo.io)",

package/src/api/calld.js

@@ -7,6 +7,7 @@ import ChatMessage from '../domain/ChatMessage';
 import Voicemail from '../domain/Voicemail';
 import Call from '../domain/Call';
 import IndirectTransfer from '../domain/IndirectTransfer';
+import MeetingStatus from '../domain/MeetingStatus';
 
 type CallQuery = {
   from_mobile: boolean,
@@ -200,4 +201,6 @@ export default (client: ApiRequester, baseUrl: string) => ({
     client.put(`${baseUrl}/users/me/calls/${callId}/record/resume`, null, null,
       ApiRequester.successResponseParser),
 
+  guestGetMeetingStatus: (meetingUuid: string): Promise<MeetingStatus> =>
+    client.get(`${baseUrl}/guests/me/meetings/${meetingUuid}/status`).then(MeetingStatus.parse),
 });

package/src/domain/MeetingStatus.js

@@ -0,0 +1,27 @@
+// @flow
+
+export type MeetingStatusResponse = {
+  full: boolean
+};
+
+export default class MeetingStatus {
+  type: string;
+
+  full: boolean;
+
+  constructor({
+    full,
+  }: Object = {}) {
+    this.full = full;
+
+    // Useful to compare instead of instanceof with minified code
+    this.type = 'MeetingStatus';
+  }
+
+  static parse(plain: MeetingStatusResponse): MeetingStatus {
+    return new MeetingStatus({
+      full: plain.full,
+    });
+  }
+
+}

package/src/domain/Phone/WebRTCPhone.js

@@ -1301,7 +1301,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
     return this.client && this.client.isConference(callSession.sipCallId);
   }
 
-  async close(): Promise<void> {
+  async close(force: boolean = false): Promise<void> {
     logger.info('WebRTC close');
 
     try {
@@ -1313,7 +1313,7 @@ export default class WebRTCPhone extends Emitter implements Phone {
       logger.error('WebRTC close, unregister error', e);
     }
 
-    this.client.close();
+    this.client.close(force);
     this.unbind();
 
     this.incomingSessions = [];

package/src/web-rtc-client.js

@@ -129,6 +129,7 @@ export default class WebRTCClient extends Emitter {
   skipRegister: boolean;
   networkMonitoringInterval: { [string]: IntervalID };
   sessionNetworkStats: { [string]: Object };
+  forceClosed: boolean;
 
   // sugar
   ON_USER_AGENT: string;
@@ -191,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);
@@ -312,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();
@@ -336,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);
@@ -614,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;
 
@@ -634,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();
 
@@ -2070,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 {