@wazo/sdk 0.39.6 → 0.39.7

package/lib/utils/__tests__/api-requester.test.js

@@ -12,7 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const node_abort_controller_1 = require("node-abort-controller");
 const api_requester_1 = __importDefault(require("../api-requester"));
 const server = 'localhost';
 const path = 'auth';
@@ -28,7 +27,6 @@ const headers = {
     'Content-Type': 'application/json',
     'X-Auth-Token': token,
 };
-const controller = new node_abort_controller_1.AbortController();
 describe('Generating query string', () => {
     it('should generate a simple query string from an object', () => {
         expect(api_requester_1.default.getQueryString({
@@ -108,7 +106,7 @@ describe('Calling fetch', () => {
         expect(global.fetch).toBeCalledWith(url, {
             method: 'get',
             body: null,
-            signal: controller.signal,
+            signal: expect.any(Object),
             headers: {},
             agent: null,
         });
@@ -150,14 +148,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/lib/utils/api-requester.js

@@ -117,7 +117,7 @@ class ApiRequester {
             const hasEmptyResponse = method === 'delete' || isHead;
             const newParse = hasEmptyResponse ? ApiRequester.successResponseParser : parse;
             const fetchOptions = Object.assign({}, (this.fetchOptions || {}));
-            const controller = new node_abort_controller_1.AbortController();
+            const controller = typeof AbortController !== 'undefined' ? new AbortController() : new node_abort_controller_1.AbortController();
             const extraHeaders = fetchOptions.headers || {};
             delete fetchOptions.headers;
             const options = Object.assign({ method, body: newBody, signal: controller ? controller.signal : null, headers: Object.assign(Object.assign({}, this.getHeaders(headers)), extraHeaders), agent: this.agent }, fetchOptions);

package/lib/web-rtc-client.js

@@ -1251,12 +1251,12 @@ class WebRTCClient extends Emitter_1.default {
                         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);
                     }
@@ -1475,7 +1475,7 @@ class WebRTCClient extends Emitter_1.default {
         // Update the local video element
         this._setupMedias(sipSession, newStream);
     }
-    updateRemoteStream(sessionId) {
+    updateRemoteStream(sessionId, allTracks = true) {
         const remoteStream = this.getRemoteStream(sessionId);
         const pc = this.getPeerConnection(sessionId);
         logger.info('Updating remote stream', {
@@ -1486,12 +1486,16 @@ class WebRTCClient extends Emitter_1.default {
         if (!pc || !remoteStream) {
             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) => {
-                remoteStream.addTrack(receiver.track);
+                if (allTracks || receiver.track.kind === 'video') {
+                    remoteStream.addTrack(receiver.track);
+                }
             });
         }
     }
@@ -1788,7 +1792,7 @@ class WebRTCClient extends Emitter_1.default {
                 // @ts-ignore
                 session.outgoingInviteRequest.message.body.body = request.body;
             }
-            this.updateRemoteStream(sipSessionId);
+            this.updateRemoteStream(sipSessionId, false);
             this._setupMedias(session);
             return this.eventEmitter.emit(ON_REINVITE, session, request, updatedCalleeName, updatedNumber, hadRemoteVideo);
         };
@@ -1802,7 +1806,7 @@ class WebRTCClient extends Emitter_1.default {
         });
         this.eventEmitter.emit(ON_EARLY_MEDIA, session);
     }
-    _onAccepted(session, sessionDialog, withEvent = true) {
+    _onAccepted(session, sessionDialog, withEvent = true, initAllTracks = true) {
         var _a;
         logger.info('on call accepted', {
             id: session.id,
@@ -1812,7 +1816,7 @@ class WebRTCClient extends Emitter_1.default {
         });
         this.storeSipSession(session);
         this._setupMedias(session);
-        this.updateRemoteStream(this.getSipSessionId(session));
+        this.updateRemoteStream(this.getSipSessionId(session), initAllTracks);
         // @ts-ignore
         const pc = (_a = session.sessionDescriptionHandler) === null || _a === void 0 ? void 0 : _a.peerConnection;
         const onTrack = (event) => {

package/package.json

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

package/src/__tests__/api-client.test.ts

@@ -1,4 +1,3 @@
-import { AbortController } from 'node-abort-controller';
 import { Base64 } from 'js-base64';
 
 import WazoApiClient from '../api-client';
@@ -6,8 +5,6 @@ import ServerError from '../domain/ServerError';
 import BadResponse from '../domain/BadResponse';
 import Session from '../domain/Session';
 
-const controller = new AbortController();
-
 const mockedResponse = {
   data: {
     token: 1,
@@ -116,7 +113,7 @@ describe('With correct API results', () => {
       expect(global.fetch).toBeCalledWith(`https://${server}/api/auth/${authVersion}/token`, {
         method: 'post',
         body: JSON.stringify(data),
-        signal: controller.signal,
+        signal: expect.any(Object),
         headers,
         agent: null,
       });
@@ -131,7 +128,7 @@ describe('With correct API results', () => {
       expect(global.fetch).toBeCalledWith(`https://${server}/api/auth/${authVersion}/token/${oldToken}`, {
         method: 'delete',
         body: null,
-        signal: controller.signal,
+        signal: expect.any(Object),
         headers: {},
         agent: null,
       });
@@ -154,7 +151,7 @@ describe('With unAuthorized API results', () => {
       expect(global.fetch).toBeCalledWith(`https://${server}/api/auth/${authVersion}/token/${tokenToCheck}`, {
         method: 'head',
         body: null,
-        signal: controller.signal,
+        signal: expect.any(Object),
         headers: {},
         agent: null,
       });
@@ -186,7 +183,7 @@ describe('With not found API results', () => {
       expect(global.fetch).toBeCalledWith(`https://${server}/api/calld/1.0/users/me/voicemails`, {
         method: 'get',
         body: null,
-        signal: controller.signal,
+        signal: expect.any(Object),
         headers: {
           'X-Auth-Token': token,
           'Content-Type': 'application/json',

package/src/domain/Session.ts

@@ -66,7 +66,9 @@ type SessionArguments = {
   expiresAt: Date;
   authorizations?: Array<Authorization>;
   engineVersion?: string | null | undefined;
+  // Deprecated, use `stackUuid`
   engineUuid?: string | null | undefined;
+  stackUuid?: string | null | undefined;
 };
 
 export default class Session {
@@ -82,7 +84,7 @@ export default class Session {
 
   tenantUuid: string | null | undefined;
 
-  engineUuid: string | null | undefined;
+  stackUuid: string | null | undefined;
 
   sessionUuid: string | null | undefined;
 
@@ -121,7 +123,7 @@ export default class Session {
       acl: plain.data.acls ? plain.data.acls : plain.data.acl ? plain.data.acl : [],
       tenantUuid: plain.data.metadata ? plain.data.metadata.tenant_uuid : undefined,
       expiresAt: new Date(`${plain.data.utc_expires_at}z`),
-      engineUuid: plain.data.xivo_uuid,
+      stackUuid: plain.data.xivo_uuid,
     });
   }
 
@@ -140,7 +142,7 @@ export default class Session {
     engineVersion,
     refreshToken,
     sessionUuid,
-    engineUuid,
+    stackUuid,
   }: SessionArguments) {
     this.token = token;
     this.uuid = uuid;
@@ -152,7 +154,7 @@ export default class Session {
     this.engineVersion = engineVersion;
     this.refreshToken = refreshToken;
     this.sessionUuid = sessionUuid;
-    this.engineUuid = engineUuid;
+    this.stackUuid = stackUuid;
   }
 
   hasExpired(date: Date = new Date()): boolean {
@@ -269,4 +271,9 @@ export default class Session {
     return this.acl;
   }
 
+  get engineUuid(): string | null | undefined {
+    console.warn('`engineUuid` property of Session has been removed in Wazo\'s SDK, please use `stackUuid` instead.');
+    return this.stackUuid;
+  }
+
 }

package/src/domain/__tests__/Session.test.ts

@@ -30,6 +30,7 @@ describe('Session domain', () => {
       expiresAt: new Date('2017-07-19T21:27:53.086990z'),
       sessionUuid: 'f14dd6d6-547c-434d-bd5c-e882b5b83b32',
       engineUuid: '6cd695d2-cdb9-4444-8b2d-27425ab85fa8',
+      stackUuid: '6cd695d2-cdb9-4444-8b2d-27425ab85fa8',
     }));
   });
   describe('about voicemails', () => {

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;