@wazo/sdk 0.37.41 → 0.38.0

package/lib/api-client.js

@@ -402,13 +402,9 @@ class IssueReporter {
 
       setTimeout(() => {
         if (isArray) {
-          payload = payload.map(message => {
-            message._retry = retry + 1;
-            return message;
-          });
-        } else {
-          // $FlowFixMe
-          payload._retry = retry + 1;
+          payload = payload.map(message => this._writeRetryCount(message, retry + 1));
+        } else if (payload && typeof payload === 'object') {
+          payload = this._writeRetryCount(payload, retry + 1);
         }
 
         this._sendDebugToGrafana(payload, retry + 1);
@@ -416,6 +412,15 @@ class IssueReporter {
     });
   }
 
+  _writeRetryCount(message                 , count        )                  {
+    if (message && typeof message === 'object') {
+      // $FlowFixMe
+      message._retry = count;
+    }
+
+    return message;
+  }
+
   _isLevelAbove(level1        , level2        ) {
     const index1 = LOG_LEVELS.indexOf(level1);
     const index2 = LOG_LEVELS.indexOf(level2);
@@ -2251,9 +2256,12 @@ var authMethods = (client              , baseUrl        ) => ({
       expiration: expiration || DETAULT_EXPIRATION,
       refresh_token: refreshToken,
       client_id: client.clientId,
-      tenant_id: tenantId,
     };
 
+    if (tenantId) {
+      body.tenant_id = tenantId;
+    }
+
     const headers         = {
       'Content-Type': 'application/json',
       ...(isMobile ? { 'Wazo-Session-Type': 'mobile' } : {}),
@@ -3541,7 +3549,9 @@ global.wazoClients = global.wazoClients || {};
 global.wazoClientId = global.wazoClientId || {};
 global.wazoClientToken = global.wazoClientToken || {};
 global.wazoRefreshToken = global.wazoRefreshToken || {};
+global.wazoRefreshTenantId = global.wazoRefreshTenantId || {};
 global.wazoOnRefreshToken = global.wazoOnRefreshToken || {};
+global.wazoOnRefreshTokenError = global.wazoOnRefreshTokenError || {};
 global.wazoRefreshExpiration = global.wazoRefreshExpiration || {};
 global.wazoRefreshBackend = global.wazoRefreshBackend || {};
 global.wazoIsMobile = global.wazoIsMobile || {};
@@ -4587,6 +4597,7 @@ class ApiClient {
 
                         
                             
+                                 
                              
                           
                            
@@ -4639,23 +4650,31 @@ class ApiClient {
       return null;
     }
 
-    const session = await this.auth.refreshToken(
-      this.refreshToken,
-      this.refreshBackend,
-      this.refreshExpiration,
-      this.isMobile,
-      this.refreshTenantId,
-    );
-
-    logger.info('token refreshed', { token: session.token });
+    try {
+      const session = await this.auth.refreshToken(
+        this.refreshToken,
+        this.refreshBackend,
+        this.refreshExpiration,
+        this.isMobile,
+        this.refreshTenantId,
+      );
+
+      logger.info('token refreshed', { token: session.token });
+
+      if (this.onRefreshToken) {
+        this.onRefreshToken(session.token, session);
+      }
 
-    if (this.onRefreshToken) {
-      this.onRefreshToken(session.token, session);
-    }
+      this.setToken(session.token);
 
-    this.setToken(session.token);
+      return session.token;
+    } catch (error) {
+      logger.error('token refresh, error', error);
 
-    return session.token;
+      if (this.onRefreshTokenError) {
+        this.onRefreshTokenError(error);
+      }
+    }
   }
 
   setToken(token        ) {
@@ -4678,6 +4697,10 @@ class ApiClient {
     this.onRefreshToken = onRefreshToken;
   }
 
+  setOnRefreshTokenError(callback          ) {
+    this.onRefreshTokenError = callback;
+  }
+
   setRefreshExpiration(refreshExpiration        ) {
     this.refreshExpiration = refreshExpiration;
   }

package/lib/checker/Checker.js

@@ -424,13 +424,9 @@ class IssueReporter {
 
       setTimeout(() => {
         if (isArray) {
-          payload = payload.map(message => {
-            message._retry = retry + 1;
-            return message;
-          });
-        } else {
-          // $FlowFixMe
-          payload._retry = retry + 1;
+          payload = payload.map(message => this._writeRetryCount(message, retry + 1));
+        } else if (payload && typeof payload === 'object') {
+          payload = this._writeRetryCount(payload, retry + 1);
         }
 
         this._sendDebugToGrafana(payload, retry + 1);
@@ -438,6 +434,15 @@ class IssueReporter {
     });
   }
 
+  _writeRetryCount(message                 , count        )                  {
+    if (message && typeof message === 'object') {
+      // $FlowFixMe
+      message._retry = count;
+    }
+
+    return message;
+  }
+
   _isLevelAbove(level1        , level2        ) {
     const index1 = LOG_LEVELS.indexOf(level1);
     const index2 = LOG_LEVELS.indexOf(level2);
@@ -2273,9 +2278,12 @@ var authMethods = (client              , baseUrl        ) => ({
       expiration: expiration || DETAULT_EXPIRATION,
       refresh_token: refreshToken,
       client_id: client.clientId,
-      tenant_id: tenantId,
     };
 
+    if (tenantId) {
+      body.tenant_id = tenantId;
+    }
+
     const headers         = {
       'Content-Type': 'application/json',
       ...(isMobile ? { 'Wazo-Session-Type': 'mobile' } : {}),
@@ -3589,7 +3597,9 @@ global.wazoClients = global.wazoClients || {};
 global.wazoClientId = global.wazoClientId || {};
 global.wazoClientToken = global.wazoClientToken || {};
 global.wazoRefreshToken = global.wazoRefreshToken || {};
+global.wazoRefreshTenantId = global.wazoRefreshTenantId || {};
 global.wazoOnRefreshToken = global.wazoOnRefreshToken || {};
+global.wazoOnRefreshTokenError = global.wazoOnRefreshTokenError || {};
 global.wazoRefreshExpiration = global.wazoRefreshExpiration || {};
 global.wazoRefreshBackend = global.wazoRefreshBackend || {};
 global.wazoIsMobile = global.wazoIsMobile || {};
@@ -4635,6 +4645,7 @@ class ApiClient {
 
                         
                             
+                                 
                              
                           
                            
@@ -4687,23 +4698,31 @@ class ApiClient {
       return null;
     }
 
-    const session = await this.auth.refreshToken(
-      this.refreshToken,
-      this.refreshBackend,
-      this.refreshExpiration,
-      this.isMobile,
-      this.refreshTenantId,
-    );
+    try {
+      const session = await this.auth.refreshToken(
+        this.refreshToken,
+        this.refreshBackend,
+        this.refreshExpiration,
+        this.isMobile,
+        this.refreshTenantId,
+      );
+
+      logger$3.info('token refreshed', { token: session.token });
+
+      if (this.onRefreshToken) {
+        this.onRefreshToken(session.token, session);
+      }
 
-    logger$3.info('token refreshed', { token: session.token });
+      this.setToken(session.token);
 
-    if (this.onRefreshToken) {
-      this.onRefreshToken(session.token, session);
-    }
-
-    this.setToken(session.token);
+      return session.token;
+    } catch (error) {
+      logger$3.error('token refresh, error', error);
 
-    return session.token;
+      if (this.onRefreshTokenError) {
+        this.onRefreshTokenError(error);
+      }
+    }
   }
 
   setToken(token        ) {
@@ -4726,6 +4745,10 @@ class ApiClient {
     this.onRefreshToken = onRefreshToken;
   }
 
+  setOnRefreshTokenError(callback          ) {
+    this.onRefreshTokenError = callback;
+  }
+
   setRefreshExpiration(refreshExpiration        ) {
     this.refreshExpiration = refreshExpiration;
   }
@@ -5299,7 +5322,7 @@ class WebSocketClient extends Emitter {
       this.close();
     }
     const url = `wss://${this.host || ''}/api/websocketd/?token=${this.token || ''}&version=${this.version}`;
-    logger$2.log('Wazo WS url computed to reconnect', { url });
+    logger$2.info('Wazo WS url computed to reconnect', { url });
 
     return url;
   }
@@ -6679,8 +6702,10 @@ class WebRTCClient extends Emitter {
       conference: isConference,
     };
 
-    // Avoid sdh to created a new stream
-    session.sessionDescriptionHandler.localMediaStreamConstraints = options.constraints;
+    // Avoid sdh to create a new stream
+    if (session.sessionDescriptionHandler) {
+      session.sessionDescriptionHandler.localMediaStreamConstraints = options.constraints;
+    }
 
     // Send re-INVITE
     return session.invite(options);

package/lib/checker/checks/aor.js

@@ -402,13 +402,9 @@ class IssueReporter {
 
       setTimeout(() => {
         if (isArray) {
-          payload = payload.map(message => {
-            message._retry = retry + 1;
-            return message;
-          });
-        } else {
-          // $FlowFixMe
-          payload._retry = retry + 1;
+          payload = payload.map(message => this._writeRetryCount(message, retry + 1));
+        } else if (payload && typeof payload === 'object') {
+          payload = this._writeRetryCount(payload, retry + 1);
         }
 
         this._sendDebugToGrafana(payload, retry + 1);
@@ -416,6 +412,15 @@ class IssueReporter {
     });
   }
 
+  _writeRetryCount(message                 , count        )                  {
+    if (message && typeof message === 'object') {
+      // $FlowFixMe
+      message._retry = count;
+    }
+
+    return message;
+  }
+
   _isLevelAbove(level1        , level2        ) {
     const index1 = LOG_LEVELS.indexOf(level1);
     const index2 = LOG_LEVELS.indexOf(level2);
@@ -2251,9 +2256,12 @@ var authMethods = (client              , baseUrl        ) => ({
       expiration: expiration || DETAULT_EXPIRATION,
       refresh_token: refreshToken,
       client_id: client.clientId,
-      tenant_id: tenantId,
     };
 
+    if (tenantId) {
+      body.tenant_id = tenantId;
+    }
+
     const headers         = {
       'Content-Type': 'application/json',
       ...(isMobile ? { 'Wazo-Session-Type': 'mobile' } : {}),
@@ -3541,7 +3549,9 @@ global.wazoClients = global.wazoClients || {};
 global.wazoClientId = global.wazoClientId || {};
 global.wazoClientToken = global.wazoClientToken || {};
 global.wazoRefreshToken = global.wazoRefreshToken || {};
+global.wazoRefreshTenantId = global.wazoRefreshTenantId || {};
 global.wazoOnRefreshToken = global.wazoOnRefreshToken || {};
+global.wazoOnRefreshTokenError = global.wazoOnRefreshTokenError || {};
 global.wazoRefreshExpiration = global.wazoRefreshExpiration || {};
 global.wazoRefreshBackend = global.wazoRefreshBackend || {};
 global.wazoIsMobile = global.wazoIsMobile || {};
@@ -4587,6 +4597,7 @@ class ApiClient {
 
                         
                             
+                                 
                              
                           
                            
@@ -4639,23 +4650,31 @@ class ApiClient {
       return null;
     }
 
-    const session = await this.auth.refreshToken(
-      this.refreshToken,
-      this.refreshBackend,
-      this.refreshExpiration,
-      this.isMobile,
-      this.refreshTenantId,
-    );
-
-    logger.info('token refreshed', { token: session.token });
+    try {
+      const session = await this.auth.refreshToken(
+        this.refreshToken,
+        this.refreshBackend,
+        this.refreshExpiration,
+        this.isMobile,
+        this.refreshTenantId,
+      );
+
+      logger.info('token refreshed', { token: session.token });
+
+      if (this.onRefreshToken) {
+        this.onRefreshToken(session.token, session);
+      }
 
-    if (this.onRefreshToken) {
-      this.onRefreshToken(session.token, session);
-    }
+      this.setToken(session.token);
 
-    this.setToken(session.token);
+      return session.token;
+    } catch (error) {
+      logger.error('token refresh, error', error);
 
-    return session.token;
+      if (this.onRefreshTokenError) {
+        this.onRefreshTokenError(error);
+      }
+    }
   }
 
   setToken(token        ) {
@@ -4678,6 +4697,10 @@ class ApiClient {
     this.onRefreshToken = onRefreshToken;
   }
 
+  setOnRefreshTokenError(callback          ) {
+    this.onRefreshTokenError = callback;
+  }
+
   setRefreshExpiration(refreshExpiration        ) {
     this.refreshExpiration = refreshExpiration;
   }

package/lib/checker/checks/api.js

@@ -402,13 +402,9 @@ class IssueReporter {
 
       setTimeout(() => {
         if (isArray) {
-          payload = payload.map(message => {
-            message._retry = retry + 1;
-            return message;
-          });
-        } else {
-          // $FlowFixMe
-          payload._retry = retry + 1;
+          payload = payload.map(message => this._writeRetryCount(message, retry + 1));
+        } else if (payload && typeof payload === 'object') {
+          payload = this._writeRetryCount(payload, retry + 1);
         }
 
         this._sendDebugToGrafana(payload, retry + 1);
@@ -416,6 +412,15 @@ class IssueReporter {
     });
   }
 
+  _writeRetryCount(message                 , count        )                  {
+    if (message && typeof message === 'object') {
+      // $FlowFixMe
+      message._retry = count;
+    }
+
+    return message;
+  }
+
   _isLevelAbove(level1        , level2        ) {
     const index1 = LOG_LEVELS.indexOf(level1);
     const index2 = LOG_LEVELS.indexOf(level2);
@@ -2251,9 +2256,12 @@ var authMethods = (client              , baseUrl        ) => ({
       expiration: expiration || DETAULT_EXPIRATION,
       refresh_token: refreshToken,
       client_id: client.clientId,
-      tenant_id: tenantId,
     };
 
+    if (tenantId) {
+      body.tenant_id = tenantId;
+    }
+
     const headers         = {
       'Content-Type': 'application/json',
       ...(isMobile ? { 'Wazo-Session-Type': 'mobile' } : {}),
@@ -3541,7 +3549,9 @@ global.wazoClients = global.wazoClients || {};
 global.wazoClientId = global.wazoClientId || {};
 global.wazoClientToken = global.wazoClientToken || {};
 global.wazoRefreshToken = global.wazoRefreshToken || {};
+global.wazoRefreshTenantId = global.wazoRefreshTenantId || {};
 global.wazoOnRefreshToken = global.wazoOnRefreshToken || {};
+global.wazoOnRefreshTokenError = global.wazoOnRefreshTokenError || {};
 global.wazoRefreshExpiration = global.wazoRefreshExpiration || {};
 global.wazoRefreshBackend = global.wazoRefreshBackend || {};
 global.wazoIsMobile = global.wazoIsMobile || {};
@@ -4587,6 +4597,7 @@ class ApiClient {
 
                         
                             
+                                 
                              
                           
                            
@@ -4639,23 +4650,31 @@ class ApiClient {
       return null;
     }
 
-    const session = await this.auth.refreshToken(
-      this.refreshToken,
-      this.refreshBackend,
-      this.refreshExpiration,
-      this.isMobile,
-      this.refreshTenantId,
-    );
-
-    logger.info('token refreshed', { token: session.token });
+    try {
+      const session = await this.auth.refreshToken(
+        this.refreshToken,
+        this.refreshBackend,
+        this.refreshExpiration,
+        this.isMobile,
+        this.refreshTenantId,
+      );
+
+      logger.info('token refreshed', { token: session.token });
+
+      if (this.onRefreshToken) {
+        this.onRefreshToken(session.token, session);
+      }
 
-    if (this.onRefreshToken) {
-      this.onRefreshToken(session.token, session);
-    }
+      this.setToken(session.token);
 
-    this.setToken(session.token);
+      return session.token;
+    } catch (error) {
+      logger.error('token refresh, error', error);
 
-    return session.token;
+      if (this.onRefreshTokenError) {
+        this.onRefreshTokenError(error);
+      }
+    }
   }
 
   setToken(token        ) {
@@ -4678,6 +4697,10 @@ class ApiClient {
     this.onRefreshToken = onRefreshToken;
   }
 
+  setOnRefreshTokenError(callback          ) {
+    this.onRefreshTokenError = callback;
+  }
+
   setRefreshExpiration(refreshExpiration        ) {
     this.refreshExpiration = refreshExpiration;
   }

package/lib/checker/checks/index.js

@@ -424,13 +424,9 @@ class IssueReporter {
 
       setTimeout(() => {
         if (isArray) {
-          payload = payload.map(message => {
-            message._retry = retry + 1;
-            return message;
-          });
-        } else {
-          // $FlowFixMe
-          payload._retry = retry + 1;
+          payload = payload.map(message => this._writeRetryCount(message, retry + 1));
+        } else if (payload && typeof payload === 'object') {
+          payload = this._writeRetryCount(payload, retry + 1);
         }
 
         this._sendDebugToGrafana(payload, retry + 1);
@@ -438,6 +434,15 @@ class IssueReporter {
     });
   }
 
+  _writeRetryCount(message                 , count        )                  {
+    if (message && typeof message === 'object') {
+      // $FlowFixMe
+      message._retry = count;
+    }
+
+    return message;
+  }
+
   _isLevelAbove(level1        , level2        ) {
     const index1 = LOG_LEVELS.indexOf(level1);
     const index2 = LOG_LEVELS.indexOf(level2);
@@ -2273,9 +2278,12 @@ var authMethods = (client              , baseUrl        ) => ({
       expiration: expiration || DETAULT_EXPIRATION,
       refresh_token: refreshToken,
       client_id: client.clientId,
-      tenant_id: tenantId,
     };
 
+    if (tenantId) {
+      body.tenant_id = tenantId;
+    }
+
     const headers         = {
       'Content-Type': 'application/json',
       ...(isMobile ? { 'Wazo-Session-Type': 'mobile' } : {}),
@@ -3589,7 +3597,9 @@ global.wazoClients = global.wazoClients || {};
 global.wazoClientId = global.wazoClientId || {};
 global.wazoClientToken = global.wazoClientToken || {};
 global.wazoRefreshToken = global.wazoRefreshToken || {};
+global.wazoRefreshTenantId = global.wazoRefreshTenantId || {};
 global.wazoOnRefreshToken = global.wazoOnRefreshToken || {};
+global.wazoOnRefreshTokenError = global.wazoOnRefreshTokenError || {};
 global.wazoRefreshExpiration = global.wazoRefreshExpiration || {};
 global.wazoRefreshBackend = global.wazoRefreshBackend || {};
 global.wazoIsMobile = global.wazoIsMobile || {};
@@ -4635,6 +4645,7 @@ class ApiClient {
 
                         
                             
+                                 
                              
                           
                            
@@ -4687,23 +4698,31 @@ class ApiClient {
       return null;
     }
 
-    const session = await this.auth.refreshToken(
-      this.refreshToken,
-      this.refreshBackend,
-      this.refreshExpiration,
-      this.isMobile,
-      this.refreshTenantId,
-    );
+    try {
+      const session = await this.auth.refreshToken(
+        this.refreshToken,
+        this.refreshBackend,
+        this.refreshExpiration,
+        this.isMobile,
+        this.refreshTenantId,
+      );
+
+      logger$2.info('token refreshed', { token: session.token });
+
+      if (this.onRefreshToken) {
+        this.onRefreshToken(session.token, session);
+      }
 
-    logger$2.info('token refreshed', { token: session.token });
+      this.setToken(session.token);
 
-    if (this.onRefreshToken) {
-      this.onRefreshToken(session.token, session);
-    }
-
-    this.setToken(session.token);
+      return session.token;
+    } catch (error) {
+      logger$2.error('token refresh, error', error);
 
-    return session.token;
+      if (this.onRefreshTokenError) {
+        this.onRefreshTokenError(error);
+      }
+    }
   }
 
   setToken(token        ) {
@@ -4726,6 +4745,10 @@ class ApiClient {
     this.onRefreshToken = onRefreshToken;
   }
 
+  setOnRefreshTokenError(callback          ) {
+    this.onRefreshTokenError = callback;
+  }
+
   setRefreshExpiration(refreshExpiration        ) {
     this.refreshExpiration = refreshExpiration;
   }
@@ -5299,7 +5322,7 @@ class WebSocketClient extends Emitter {
       this.close();
     }
     const url = `wss://${this.host || ''}/api/websocketd/?token=${this.token || ''}&version=${this.version}`;
-    logger$1.log('Wazo WS url computed to reconnect', { url });
+    logger$1.info('Wazo WS url computed to reconnect', { url });
 
     return url;
   }
@@ -6679,8 +6702,10 @@ class WebRTCClient extends Emitter {
       conference: isConference,
     };
 
-    // Avoid sdh to created a new stream
-    session.sessionDescriptionHandler.localMediaStreamConstraints = options.constraints;
+    // Avoid sdh to create a new stream
+    if (session.sessionDescriptionHandler) {
+      session.sessionDescriptionHandler.localMediaStreamConstraints = options.constraints;
+    }
 
     // Send re-INVITE
     return session.invite(options);

package/lib/checker/checks/wazo-websocket.js

@@ -395,13 +395,9 @@ class IssueReporter {
 
       setTimeout(() => {
         if (isArray) {
-          payload = payload.map(message => {
-            message._retry = retry + 1;
-            return message;
-          });
-        } else {
-          // $FlowFixMe
-          payload._retry = retry + 1;
+          payload = payload.map(message => this._writeRetryCount(message, retry + 1));
+        } else if (payload && typeof payload === 'object') {
+          payload = this._writeRetryCount(payload, retry + 1);
         }
 
         this._sendDebugToGrafana(payload, retry + 1);
@@ -409,6 +405,15 @@ class IssueReporter {
     });
   }
 
+  _writeRetryCount(message                 , count        )                  {
+    if (message && typeof message === 'object') {
+      // $FlowFixMe
+      message._retry = count;
+    }
+
+    return message;
+  }
+
   _isLevelAbove(level1        , level2        ) {
     const index1 = LOG_LEVELS.indexOf(level1);
     const index2 = LOG_LEVELS.indexOf(level2);
@@ -869,7 +874,7 @@ class WebSocketClient extends Emitter {
       this.close();
     }
     const url = `wss://${this.host || ''}/api/websocketd/?token=${this.token || ''}&version=${this.version}`;
-    logger.log('Wazo WS url computed to reconnect', { url });
+    logger.info('Wazo WS url computed to reconnect', { url });
 
     return url;
   }