@wazo/sdk 0.39.14 → 0.40.0

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

@@ -81,13 +81,12 @@ describe('Calling fetch', () => {
   it('should call fetch without body but query string in get method', async () => {
     jest.mock('node-fetch/src/index', () => {});
 
-    // @ts-ignore
     global.fetch = jest.fn(() => Promise.resolve({
       json: () => Promise.resolve({}),
       headers: {
         get: () => '',
       },
-    }));
+    })) as any;
 
     await new ApiRequester({
       server,
@@ -111,7 +110,7 @@ describe('With a refresh token', () => {
   it('should retry the call with a new token', async () => {
     jest.mock('node-fetch/src/index', () => {});
     let calls = 0;
-    // @ts-ignore
+
     global.fetch = jest.fn(() => {
       calls++;
       return Promise.resolve({
@@ -121,7 +120,7 @@ describe('With a refresh token', () => {
         status: calls === 1 ? 401 : 200,
         json: () => Promise.resolve({}),
       });
-    });
+    }) as any;
     const requester = new ApiRequester({
       server,
       agent: null,

package/src/utils/__tests__/sdp.test.ts

@@ -1,6 +1,6 @@
 /* eslint-disable max-len */
 import sdpParser from 'sdp-transform';
-import { getCandidates, isSdpValid, parseCandidate, areCandidateValid, fixSdp, fixBundle, toggleVideoDirection, hasAnActiveVideo, addIcesInAllBundles } from '../sdp';
+import { getCandidates, isSdpValid, parseCandidate, areCandidateValid, fixSdp, fixBundle, toggleVideoDirection, hasAnActiveVideo, addIcesInAllBundles, Candidate } from '../sdp';
 
 const goodSdp = `
 c=IN IP4 203.0.113.1
@@ -85,26 +85,22 @@ describe('SDP utils', () => {
       expect(candidates[1].type).toBe('relay');
       expect(isSdpValid(goodSdp)).toBeTruthy();
       expect(getCandidates(badMobileSdp).length).toBe(0);
-      expect(getCandidates(null).length).toBe(0);
+      expect(getCandidates(null as any).length).toBe(0);
       expect(getCandidates('').length).toBe(0);
       expect(getCandidates('nothing!').length).toBe(0);
     });
   });
   describe('Parsing candidate', () => {
     it('should parse a single candidate', () => {
-      const parsed = parseCandidate(candidate);
-      // @ts-expect-error
+      const parsed = parseCandidate(candidate) as Record<string, any>;
       expect(parsed.type).toBe('relay');
-      // @ts-expect-error
       expect(parsed.ip).toBe('14.72.2.1');
     });
   });
   describe('Validating candidates', () => {
     it('should parse a single candidate', () => {
-      // @ts-expect-error
-      expect(areCandidateValid([null])).toBeFalsy();
-      // @ts-expect-error
-      expect(areCandidateValid([parseCandidate(candidate)])).toBeTruthy();
+      expect(areCandidateValid([])).toBeFalsy();
+      expect(areCandidateValid([parseCandidate(candidate) as any])).toBeTruthy();
     });
   });
   describe('Validating sdp', () => {
@@ -117,14 +113,11 @@ describe('SDP utils', () => {
   describe('Fixing sdp', () => {
     it('should fix a SDP without candidate or IN ip', () => {
       const candidates = [parseCandidate(candidate)];
-      // @ts-expect-error
-      const fixedSdp = fixSdp(badMobileSdp, candidates);
+      const fixedSdp = fixSdp(badMobileSdp, candidates as Candidate[]);
       const parsed = sdpParser.parse(fixedSdp);
-      // @ts-expect-error
-      expect(parsed.media[0].candidates.length).toBe(1);
-      expect(parsed.media[0].port).toBe(57021);
-      // @ts-expect-error
-      expect(parsed.origin.address).toBe('14.72.2.1');
+      expect((parsed.media[0] as any).candidates.length).toBe(1);
+      expect((parsed.media[0] as any).port).toBe(57021);
+      expect((parsed.origin as any).address).toBe('14.72.2.1');
       expect(fixedSdp.indexOf('IN 0.0.0.0')).toBe(-1);
     });
   });
@@ -132,8 +125,7 @@ describe('SDP utils', () => {
     it('should set a bundle for each m section', async () => {
       const invalid = fixBundle(invalidBundle);
       const parsed = sdpParser.parse(invalid);
-      // @ts-expect-error
-      expect(parsed.groups[0].mids).toBe('0 1');
+      expect((parsed.groups?.[0] as any).mids).toBe('0 1');
     });
   });
   describe('Deactivate video', () => {
@@ -160,14 +152,10 @@ a=candidate:0 1 UDP 2113667327 203.0.113.1 54400 typ host
 a=candidate:3996450952 1 udp 41819903 14.72.21.2 65092 typ relay raddr 0.0.0.0 rport 0 generation 0 network-id 3 network-cost 10
 `;
       const fixedAudioWithoutCandidate = sdpParser.parse(addIcesInAllBundles(audioWithoutCandidate));
-      // @ts-expect-error
-      expect(fixedAudioWithoutCandidate.media[0].candidates[0].type).toBe('host');
-      // @ts-expect-error
-      expect(fixedAudioWithoutCandidate.media[0].candidates[1].type).toBe('relay');
-      // @ts-expect-error
-      expect(fixedAudioWithoutCandidate.media[1].candidates[0].type).toBe('host');
-      // @ts-expect-error
-      expect(fixedAudioWithoutCandidate.media[1].candidates[1].type).toBe('relay');
+      expect((fixedAudioWithoutCandidate.media[0] as any).candidates[0].type).toBe('host');
+      expect((fixedAudioWithoutCandidate.media[0] as any).candidates[1].type).toBe('relay');
+      expect((fixedAudioWithoutCandidate.media[1] as any).candidates[0].type).toBe('host');
+      expect((fixedAudioWithoutCandidate.media[1] as any).candidates[1].type).toBe('relay');
       // It should not add candidate if already present
       const audioWithCandidate = `
 c=IN IP4 203.0.113.1
@@ -178,10 +166,8 @@ m=video 54400 RTP/SAVPF 0 96
 a=candidate:0 1 UDP 2113667327 203.0.113.1 54400 typ host
 `;
       const fixedAudioWithCandidate = sdpParser.parse(addIcesInAllBundles(audioWithCandidate));
-      // @ts-expect-error
-      expect(fixedAudioWithCandidate.media[0].candidates[0].type).toBe('srflx');
-      // @ts-expect-error
-      expect(fixedAudioWithCandidate.media[1].candidates[0].type).toBe('host');
+      expect((fixedAudioWithCandidate.media?.[0] as any).candidates[0].type).toBe('srflx');
+      expect((fixedAudioWithCandidate.media?.[1] as any).candidates[0].type).toBe('host');
     });
   });
 });

package/src/utils/api-requester.ts

@@ -1,8 +1,5 @@
-/* eslint-disable @typescript-eslint/default-param-last */
 /* global window */
-
 /* eslint-disable global-require */
-
 /* eslint-disable import/no-dynamic-require */
 import { Base64 } from 'js-base64';
 import { AbortController as NodeAbortController } from 'node-abort-controller';
@@ -265,7 +262,7 @@ export default class ApiRequester {
     method: string,
     body: Record<string, any> | null | undefined = null,
     headers: (string | null | undefined) | (Record<string, any> | null | undefined) = null,
-    parse: ((...args: Array<any>) => any),
+    parse: ((...args: Array<any>) => any) | undefined = undefined,
   ) {
     const isTokenNotFound = this._isTokenNotFound(err);
 

package/src/utils/sdp.ts

@@ -1,47 +1,67 @@
 import sdpParser from 'sdp-transform';
 
-export const getCandidates = (rawSdp: string | null | undefined): Record<string, any>[] => {
+export type Candidate = {
+  foundation: string;
+  component: number;
+  transport: string;
+  priority: number | string;
+  ip: string;
+  port: number;
+  type: string;
+  raddr?: string | undefined;
+  rport?: number | undefined;
+  tcptype?: string | undefined;
+  generation?: number | undefined;
+  'network-id'?: number | undefined;
+  'network-cost'?: number | undefined;
+};
+
+export const getCandidates = (rawSdp?: string): Candidate[] => {
   if (!rawSdp) {
     return [];
   }
 
-  const sdp: any = sdpParser.parse(rawSdp);
+  const sdp = sdpParser.parse(rawSdp);
 
   if (!sdp || !sdp.media) {
     return [];
   }
 
-  return sdp.media.map((media: any) => media.candidates).flat().filter((candidate: any) => !!candidate);
+  // @ts-ignore: Type 'undefined' is not assignable to type 'Candidate'
+  return sdp.media.map((media) => media.candidates).flat().filter((candidate) => !!candidate);
 };
-export const parseCandidate = (candidate?: string): Record<string, any> | null => {
+export const parseCandidate = (candidate?: string): Candidate | null => {
   if (!candidate) {
     return null;
   }
 
-  const result: any = sdpParser.parse(candidate.indexOf('a=') === 0 ? candidate : `a=${candidate}`);
+  const result = sdpParser.parse(candidate.indexOf('a=') === 0 ? candidate : `a=${candidate}`);
+  // @ts-ignore: heads up -- Property 'candidates' does not exist on type 'SessionDescription'
   return result.candidates ? result.candidates[0] : null;
 };
 
-const getSrflxOrRelay = (candidates: Record<string, any>[]): Record<string, any>[] => candidates.filter(candidate => candidate && (candidate.type === 'srflx' || candidate.type === 'relay'));
+const getSrflxOrRelay = (candidates: Candidate[]): Candidate[] => candidates.filter(candidate => candidate && (candidate.type === 'srflx' || candidate.type === 'relay'));
 
-export const areCandidateValid = (candidates: Record<string, any>[]): boolean => getSrflxOrRelay(candidates).length > 0;
-export const isSdpValid = (sdp: string | null | undefined): boolean => {
+export const areCandidateValid = (candidates: Candidate[]): boolean => (candidates ? getSrflxOrRelay(candidates).length > 0 : false);
+export const isSdpValid = (sdp: string): boolean => {
   const candidates = getCandidates(sdp);
   return areCandidateValid(candidates);
 };
 export const fixBundle = (sdp: string): string => {
-  const parsedSdp: any = sdpParser.parse(sdp);
-  const bundleIndex = parsedSdp.groups.findIndex((group: any) => group.type === 'BUNDLE');
+  const parsedSdp = sdpParser.parse(sdp);
+  const bundleIndex = parsedSdp.groups?.findIndex((group) => group.type === 'BUNDLE');
 
   if (bundleIndex !== -1) {
-    parsedSdp.groups[bundleIndex].mids = parsedSdp.media.map((media: any, index: any) => ('mid' in media ? media.mid : index)).join(' ');
+    // @ts-ignore
+    parsedSdp.groups[bundleIndex].mids = parsedSdp.media.map((media, index) => ('mid' in media ? media.mid : index)).join(' ');
   }
 
   return sdpParser.write(parsedSdp);
 };
 export const toggleVideoDirection = (sdp: string, direction: string | null | undefined): string => {
-  const parsedSdp: any = sdpParser.parse(sdp);
-  parsedSdp.media = parsedSdp.media.map((media: any) => ({ ...media,
+  const parsedSdp = sdpParser.parse(sdp);
+  // @ts-ignore: heads up -- odd rewriting of sdp.media
+  parsedSdp.media = parsedSdp.media.map(media => ({ ...media,
     ...(media.type === 'video' ? {
       direction,
     } : {}),
@@ -76,16 +96,17 @@ export const hasAnActiveVideo = (sdp: string | null | undefined): boolean => {
   const parsedSdp = sdpParser.parse(sdp);
   return !!parsedSdp.media.find(media => media.type === 'video' && media.port > 10 && (!media.direction || media.direction !== 'inactive'));
 };
-export const fixSdp = (sdp: string, candidates: Record<string, any>[], forcePort = true): string => {
-  const parsedSdp: any = sdpParser.parse(sdp);
-  const mainCandidate = getSrflxOrRelay(candidates)[0];
+export const fixSdp = (sdp: string, candidates: Candidate[], forcePort = true): string => {
+  const parsedSdp = sdpParser.parse(sdp);
+  const mainCandidate = getSrflxOrRelay(candidates as Candidate[])[0];
   const ip = mainCandidate ? mainCandidate.ip : null;
 
   if (ip) {
+    // @ts-ignore
     parsedSdp.origin.address = ip;
   }
 
-  parsedSdp.media = parsedSdp.media.map((media: any) => {
+  parsedSdp.media = parsedSdp.media.map((media) => {
     const port = forcePort ? mainCandidate ? mainCandidate.port : media.port : media.port;
     return { ...media,
       port,