@wazo/sdk 0.39.5 → 0.39.7

package/src/utils/__tests__/api-requester.test.ts

@@ -1,5 +1,3 @@
-import { AbortController } from 'node-abort-controller';
-
 import ApiRequester from '../api-requester';
 
 const server = 'localhost';
@@ -16,7 +14,6 @@ const headers = {
   'Content-Type': 'application/json',
   'X-Auth-Token': token,
 };
-const controller = new AbortController();
 
 describe('Generating query string', () => {
   it('should generate a simple query string from an object', () => {
@@ -103,7 +100,7 @@ describe('Calling fetch', () => {
     expect(global.fetch).toBeCalledWith(url, {
       method: 'get',
       body: null,
-      signal: controller.signal,
+      signal: expect.any(Object),
       headers: {},
       agent: null,
     });
@@ -148,14 +145,14 @@ describe('With a refresh token', () => {
     expect(global.fetch).toHaveBeenNthCalledWith(1, url, {
       method: 'get',
       body: null,
-      signal: controller.signal,
+      signal: expect.any(Object),
       headers,
       agent: null,
     });
     expect(global.fetch).toHaveBeenNthCalledWith(2, url, {
       method: 'get',
       body: null,
-      signal: controller.signal,
+      signal: expect.any(Object),
       headers: updatedHeaders,
       agent: null,
     });

package/src/utils/api-requester.ts

@@ -5,7 +5,7 @@
 
 /* eslint-disable import/no-dynamic-require */
 import { Base64 } from 'js-base64';
-import { AbortController } from 'node-abort-controller';
+import { AbortController as NodeAbortController } from 'node-abort-controller';
 
 import BadResponse from '../domain/BadResponse';
 import ServerError from '../domain/ServerError';
@@ -171,9 +171,8 @@ export default class ApiRequester {
     const isHead = method === 'head';
     const hasEmptyResponse = method === 'delete' || isHead;
     const newParse = hasEmptyResponse ? ApiRequester.successResponseParser : parse;
-    const fetchOptions = { ...(this.fetchOptions || {}),
-    };
-    const controller = new AbortController();
+    const fetchOptions = { ...(this.fetchOptions || {}) };
+    const controller = typeof AbortController !== 'undefined' ? new AbortController() : new NodeAbortController();
     const extraHeaders = fetchOptions.headers || {};
     delete fetchOptions.headers;
     const options = {

package/src/web-rtc-client.ts

@@ -1493,14 +1493,14 @@ export default class WebRTCClient extends Emitter {
             wasMuted,
             shouldDoScreenSharing,
           });
-          this.updateRemoteStream(this.getSipSessionId(sipSession));
+          this.updateRemoteStream(this.getSipSessionId(sipSession), false);
 
           if (wasMuted) {
             this.mute(sipSession);
           }
 
           // @ts-ignore
-          this._onAccepted(sipSession, response.session, false);
+          this._onAccepted(sipSession, response.session, false, false);
 
           if (shouldDoScreenSharing) {
             this.eventEmitter.emit(ON_SCREEN_SHARING_REINVITE, sipSession, response, desktop);
@@ -1775,7 +1775,7 @@ export default class WebRTCClient extends Emitter {
     this._setupMedias(sipSession, newStream);
   }
 
-  updateRemoteStream(sessionId: string): void {
+  updateRemoteStream(sessionId: string, allTracks = true): void {
     const remoteStream = this.getRemoteStream(sessionId);
     const pc = this.getPeerConnection(sessionId);
     logger.info('Updating remote stream', {
@@ -1788,13 +1788,17 @@ export default class WebRTCClient extends Emitter {
       return;
     }
 
-    remoteStream.getVideoTracks().forEach(track => {
-      remoteStream.removeTrack(track);
+    remoteStream.getTracks().forEach(track => {
+      if (allTracks || track.kind === 'video') {
+        remoteStream.removeTrack(track);
+      }
     });
 
     if (pc.getReceivers) {
       pc.getReceivers().forEach((receiver: any) => {
-        remoteStream.addTrack(receiver.track);
+        if (allTracks || receiver.track.kind === 'video') {
+          remoteStream.addTrack(receiver.track);
+        }
       });
     }
   }
@@ -2164,7 +2168,7 @@ export default class WebRTCClient extends Emitter {
         session.outgoingInviteRequest.message.body.body = request.body;
       }
 
-      this.updateRemoteStream(sipSessionId);
+      this.updateRemoteStream(sipSessionId, false);
 
       this._setupMedias(session);
 
@@ -2183,7 +2187,7 @@ export default class WebRTCClient extends Emitter {
     this.eventEmitter.emit(ON_EARLY_MEDIA, session);
   }
 
-  _onAccepted(session: Inviter | Invitation, sessionDialog?: SessionDialog, withEvent = true): void {
+  _onAccepted(session: Inviter | Invitation, sessionDialog?: SessionDialog, withEvent = true, initAllTracks = true): void {
     logger.info('on call accepted', {
       id: session.id,
       clientId: this.clientId,
@@ -2194,7 +2198,7 @@ export default class WebRTCClient extends Emitter {
 
     this._setupMedias(session);
 
-    this.updateRemoteStream(this.getSipSessionId(session));
+    this.updateRemoteStream(this.getSipSessionId(session), initAllTracks);
     // @ts-ignore
     const pc = session.sessionDescriptionHandler?.peerConnection;