@wazo/sdk 0.37.40 → 0.37.43

package/esm/simple/room/Stream.js

@@ -1909,13 +1909,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);
@@ -1923,6 +1919,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);
@@ -2265,9 +2270,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' } : {}),
@@ -5415,6 +5423,7 @@ class ApiClient {
 
                         
                             
+                                 
                              
                           
                            
@@ -5467,23 +5476,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$a.info('token refreshed', { token: session.token });
+      logger$a.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;
+      return session.token;
+    } catch (error) {
+      logger$a.error('token refresh, error', error);
+
+      if (this.onRefreshTokenError) {
+        this.onRefreshTokenError(error);
+      }
+    }
   }
 
   setToken(token        ) {
@@ -5506,6 +5523,10 @@ class ApiClient {
     this.onRefreshToken = onRefreshToken;
   }
 
+  setOnRefreshTokenError(callback          ) {
+    this.onRefreshTokenError = callback;
+  }
+
   setRefreshExpiration(refreshExpiration        ) {
     this.refreshExpiration = refreshExpiration;
   }
@@ -5541,7 +5562,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 || {};
@@ -5563,10 +5586,18 @@ const setRefreshToken = (newRefreshToken         , forServer          = null) =>
   global.wazoRefreshToken[forServer] = newRefreshToken;
 };
 
+const setRefreshTenantId = (refreshTenantId         , forServer          = null) => {
+  global.wazoRefreshTenantId[forServer] = refreshTenantId;
+};
+
 const setOnRefreshToken = (onRefreshToken          , forServer          = null) => {
   global.wazoOnRefreshToken[forServer] = onRefreshToken;
 };
 
+const setOnRefreshTokenError = (callback          , forServer          = null) => {
+  global.wazoOnRefreshTokenError[forServer] = callback;
+};
+
 const setRefreshExpiration = (refreshExpiration        , forServer          = null) => {
   global.wazoRefreshExpiration[forServer] = refreshExpiration;
 };
@@ -5585,12 +5616,20 @@ const fillClient = (apiClient               ) => {
 
   apiClient.setRefreshToken(global.wazoRefreshToken[server] || global.wazoRefreshToken[null] || apiClient.refreshToken);
 
+  apiClient.setRefreshTenantId(
+    global.wazoRefreshTenantId[server] || global.wazoRefreshTenantId[null] || apiClient.refreshTenantId,
+  );
+
   apiClient.setFetchOptions(global.wazoFetchOptions[server] || global.wazoFetchOptions[null] || apiClient.fetchOptions);
 
   apiClient.setOnRefreshToken(
     global.wazoOnRefreshToken[server] || global.wazoOnRefreshToken[null] || apiClient.onRefreshToken,
   );
 
+  apiClient.setOnRefreshTokenError(
+    global.wazoOnRefreshTokenError[server] || global.wazoOnRefreshTokenError[null] || apiClient.onRefreshTokenError,
+  );
+
   apiClient.setRefreshExpiration(
     global.wazoRefreshExpiration[server] || global.wazoRefreshExpiration[null] || apiClient.refreshExpiration,
   );
@@ -5604,7 +5643,7 @@ const fillClient = (apiClient               ) => {
   return apiClient;
 };
 
-var getApiClient = (forServer         )                => {
+var getApiClient = (forServer          = null)                => {
   const server         = forServer || global.wazoCurrentServer || '';
   if (server in global.wazoClients) {
     return fillClient(global.wazoClients[server]);
@@ -5631,6 +5670,7 @@ class Auth {
                 
                     
                                     
+                                         
                          
                   
                        
@@ -5668,6 +5708,14 @@ class Auth {
         this.onRefreshTokenCallback(token, session);
       }
     });
+
+    setOnRefreshTokenError(error => {
+      logger$9.error('on refresh token error', error);
+
+      if (this.onRefreshTokenCallbackError) {
+        this.onRefreshTokenCallbackError(error);
+      }
+    });
   }
 
   setFetchOptions(options        ) {
@@ -5756,6 +5804,10 @@ class Auth {
     this.onRefreshTokenCallback = callback;
   }
 
+  setOnRefreshTokenError(callback          ) {
+    this.onRefreshTokenCallbackError = callback;
+  }
+
   checkAuthorizations(session         , authorizationName         ) {
     if (!authorizationName) {
       return;
@@ -5788,6 +5840,12 @@ class Auth {
     setRefreshToken(refreshToken);
   }
 
+  setRefreshTenantId(refreshTenantId        ) {
+    setRefreshTenantId(refreshTenantId);
+
+    getApiClient().setRefreshTenantId(refreshTenantId);
+  }
+
   forceRefreshToken() {
     getApiClient().forceRefreshToken();
   }
@@ -7422,8 +7480,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);
@@ -9394,7 +9454,7 @@ class WebRTCPhone extends Emitter                  {
         // When stopping screenshare and we had video before that, we have to re-upgrade
         // When upgrading directly to screenshare (eg: we don't have a videoLocalStream to replace)
         // We have to downgrade to audio.
-        const screenshareStopped = this.currentScreenShare.sender && this.currentScreenShare.hadVideo;
+        const screenshareStopped = this.currentScreenShare.hadVideo;
         const constraints = { audio: false, video: screenshareStopped };
 
         // We have to remove the video sender to be able to re-upgrade to video in `sendReinvite` below
@@ -9838,7 +9898,7 @@ class WebRTCPhone extends Emitter                  {
 
     logger$7.info('WebRTC hold sip session', { sipId: sipSession.id, hasVideo });
 
-    // Stop screenshre if needed
+    // Stop screenshare if needed
     if (this.currentScreenShare && this.currentScreenShare.sipSessionId === sessionId) {
       this.lastScreenShare = this.currentScreenShare;
       await this.stopScreenSharing(false, callSession);
@@ -10414,7 +10474,7 @@ class WebRTCPhone extends Emitter                  {
     });
 
     this.client.on(this.client.DISCONNECTED, () => {
-      logger$7.warn('WebRTC client disconnected');
+      logger$7.info('WebRTC client disconnected');
 
       this.eventEmitter.emit(ON_UNREGISTERED);
 
@@ -10600,7 +10660,7 @@ class WebRTCPhone extends Emitter                  {
       endTime: fromSession ? fromSession.endTime : null,
       answered: state === SessionState.Established,
       paused: this.client.isCallHeld(sipSession),
-      isCaller: 'incoming' in extra ? !extra.incoming : false,
+      isCaller: fromSession ? fromSession.isCaller : ('incoming' in extra ? !extra.incoming : false),
       cameraEnabled: fromSession ? fromSession.isCameraEnabled() : this.client.hasVideo(sessionId),
       number,
       ringing: false,
@@ -11434,7 +11494,7 @@ class WebSocketClient extends Emitter {
       this.close();
     }
     const url = `wss://${this.host || ''}/api/websocketd/?token=${this.token || ''}&version=${this.version}`;
-    logger$5.log('Wazo WS url computed to reconnect', { url });
+    logger$5.info('Wazo WS url computed to reconnect', { url });
 
     return url;
   }

package/esm/simple/room/__tests__/RemoteParticipant.test.js

@@ -1909,13 +1909,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);
@@ -1923,6 +1919,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);
@@ -2265,9 +2270,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' } : {}),
@@ -5415,6 +5423,7 @@ class ApiClient {
 
                         
                             
+                                 
                              
                           
                            
@@ -5467,23 +5476,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$a.info('token refreshed', { token: session.token });
+      logger$a.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;
+      return session.token;
+    } catch (error) {
+      logger$a.error('token refresh, error', error);
+
+      if (this.onRefreshTokenError) {
+        this.onRefreshTokenError(error);
+      }
+    }
   }
 
   setToken(token        ) {
@@ -5506,6 +5523,10 @@ class ApiClient {
     this.onRefreshToken = onRefreshToken;
   }
 
+  setOnRefreshTokenError(callback          ) {
+    this.onRefreshTokenError = callback;
+  }
+
   setRefreshExpiration(refreshExpiration        ) {
     this.refreshExpiration = refreshExpiration;
   }
@@ -5541,7 +5562,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 || {};
@@ -5563,10 +5586,18 @@ const setRefreshToken = (newRefreshToken         , forServer          = null) =>
   global.wazoRefreshToken[forServer] = newRefreshToken;
 };
 
+const setRefreshTenantId = (refreshTenantId         , forServer          = null) => {
+  global.wazoRefreshTenantId[forServer] = refreshTenantId;
+};
+
 const setOnRefreshToken = (onRefreshToken          , forServer          = null) => {
   global.wazoOnRefreshToken[forServer] = onRefreshToken;
 };
 
+const setOnRefreshTokenError = (callback          , forServer          = null) => {
+  global.wazoOnRefreshTokenError[forServer] = callback;
+};
+
 const setRefreshExpiration = (refreshExpiration        , forServer          = null) => {
   global.wazoRefreshExpiration[forServer] = refreshExpiration;
 };
@@ -5585,12 +5616,20 @@ const fillClient = (apiClient               ) => {
 
   apiClient.setRefreshToken(global.wazoRefreshToken[server] || global.wazoRefreshToken[null] || apiClient.refreshToken);
 
+  apiClient.setRefreshTenantId(
+    global.wazoRefreshTenantId[server] || global.wazoRefreshTenantId[null] || apiClient.refreshTenantId,
+  );
+
   apiClient.setFetchOptions(global.wazoFetchOptions[server] || global.wazoFetchOptions[null] || apiClient.fetchOptions);
 
   apiClient.setOnRefreshToken(
     global.wazoOnRefreshToken[server] || global.wazoOnRefreshToken[null] || apiClient.onRefreshToken,
   );
 
+  apiClient.setOnRefreshTokenError(
+    global.wazoOnRefreshTokenError[server] || global.wazoOnRefreshTokenError[null] || apiClient.onRefreshTokenError,
+  );
+
   apiClient.setRefreshExpiration(
     global.wazoRefreshExpiration[server] || global.wazoRefreshExpiration[null] || apiClient.refreshExpiration,
   );
@@ -5604,7 +5643,7 @@ const fillClient = (apiClient               ) => {
   return apiClient;
 };
 
-var getApiClient = (forServer         )                => {
+var getApiClient = (forServer          = null)                => {
   const server         = forServer || global.wazoCurrentServer || '';
   if (server in global.wazoClients) {
     return fillClient(global.wazoClients[server]);
@@ -5631,6 +5670,7 @@ class Auth {
                 
                     
                                     
+                                         
                          
                   
                        
@@ -5668,6 +5708,14 @@ class Auth {
         this.onRefreshTokenCallback(token, session);
       }
     });
+
+    setOnRefreshTokenError(error => {
+      logger$9.error('on refresh token error', error);
+
+      if (this.onRefreshTokenCallbackError) {
+        this.onRefreshTokenCallbackError(error);
+      }
+    });
   }
 
   setFetchOptions(options        ) {
@@ -5756,6 +5804,10 @@ class Auth {
     this.onRefreshTokenCallback = callback;
   }
 
+  setOnRefreshTokenError(callback          ) {
+    this.onRefreshTokenCallbackError = callback;
+  }
+
   checkAuthorizations(session         , authorizationName         ) {
     if (!authorizationName) {
       return;
@@ -5788,6 +5840,12 @@ class Auth {
     setRefreshToken(refreshToken);
   }
 
+  setRefreshTenantId(refreshTenantId        ) {
+    setRefreshTenantId(refreshTenantId);
+
+    getApiClient().setRefreshTenantId(refreshTenantId);
+  }
+
   forceRefreshToken() {
     getApiClient().forceRefreshToken();
   }
@@ -7422,8 +7480,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);
@@ -9394,7 +9454,7 @@ class WebRTCPhone extends Emitter                  {
         // When stopping screenshare and we had video before that, we have to re-upgrade
         // When upgrading directly to screenshare (eg: we don't have a videoLocalStream to replace)
         // We have to downgrade to audio.
-        const screenshareStopped = this.currentScreenShare.sender && this.currentScreenShare.hadVideo;
+        const screenshareStopped = this.currentScreenShare.hadVideo;
         const constraints = { audio: false, video: screenshareStopped };
 
         // We have to remove the video sender to be able to re-upgrade to video in `sendReinvite` below
@@ -9838,7 +9898,7 @@ class WebRTCPhone extends Emitter                  {
 
     logger$7.info('WebRTC hold sip session', { sipId: sipSession.id, hasVideo });
 
-    // Stop screenshre if needed
+    // Stop screenshare if needed
     if (this.currentScreenShare && this.currentScreenShare.sipSessionId === sessionId) {
       this.lastScreenShare = this.currentScreenShare;
       await this.stopScreenSharing(false, callSession);
@@ -10414,7 +10474,7 @@ class WebRTCPhone extends Emitter                  {
     });
 
     this.client.on(this.client.DISCONNECTED, () => {
-      logger$7.warn('WebRTC client disconnected');
+      logger$7.info('WebRTC client disconnected');
 
       this.eventEmitter.emit(ON_UNREGISTERED);
 
@@ -10600,7 +10660,7 @@ class WebRTCPhone extends Emitter                  {
       endTime: fromSession ? fromSession.endTime : null,
       answered: state === SessionState.Established,
       paused: this.client.isCallHeld(sipSession),
-      isCaller: 'incoming' in extra ? !extra.incoming : false,
+      isCaller: fromSession ? fromSession.isCaller : ('incoming' in extra ? !extra.incoming : false),
       cameraEnabled: fromSession ? fromSession.isCameraEnabled() : this.client.hasVideo(sessionId),
       number,
       ringing: false,
@@ -11434,7 +11494,7 @@ class WebSocketClient extends Emitter {
       this.close();
     }
     const url = `wss://${this.host || ''}/api/websocketd/?token=${this.token || ''}&version=${this.version}`;
-    logger$5.log('Wazo WS url computed to reconnect', { url });
+    logger$5.info('Wazo WS url computed to reconnect', { url });
 
     return url;
   }