@wazo/sdk 0.39.15 → 0.40.0

package/src/simple/Phone.ts

@@ -1,5 +1,4 @@
 import { SessionState } from 'sip.js/lib/api/session-state';
-import { Inviter, Invitation } from 'sip.js/lib/api';
 import { OutgoingInviteRequest } from 'sip.js/lib/core';
 import type SipLine from '../domain/SipLine';
 import type Session from '../domain/Session';
@@ -9,123 +8,17 @@ import WebRTCPhone, * as PHONE_EVENTS from '../domain/Phone/WebRTCPhone';
 import { MESSAGE_TYPE_CHAT, MESSAGE_TYPE_SIGNAL } from '../domain/Phone/WebRTCPhone';
 import WazoWebRTCClient, { events as clientEvents, transportEvents } from '../web-rtc-client';
 import IssueReporter from '../service/IssueReporter';
-import Emitter, { IEmitter } from '../utils/Emitter';
+import Emitter from '../utils/Emitter';
 import Wazo from './index';
 import SFUNotAvailableError from '../domain/SFUNotAvailableError';
-import { ConnectionOptions } from '../domain/types';
+import { ConnectionOptions, WazoSession } from '../domain/types';
 
 const logger = IssueReporter.loggerFor('simple-phone');
 const sipLogger = IssueReporter.loggerFor('sip.js');
 const protocolLogger = IssueReporter.loggerFor('sip');
 const protocolDebugMessages = ['Received WebSocket text message:', 'Sending WebSocket message:'];
 
-export interface IPhone extends IEmitter {
-  client: WazoWebRTCClient;
-  phone: WebRTCPhone | null | undefined;
-  session: Session;
-  sipLine: SipLine | null | undefined;
-  SessionState: Record<string, any>;
-
-  ON_USER_AGENT: string;
-  ON_REGISTERED: string;
-  ON_UNREGISTERED: string;
-  ON_PROGRESS: string;
-  ON_CALL_ACCEPTED: string;
-  ON_CALL_ANSWERED: string;
-  ON_CALL_INCOMING: string;
-  ON_CALL_OUTGOING: string;
-  ON_CALL_MUTED: string;
-  ON_CALL_UNMUTED: string;
-  ON_CALL_RESUMED: string;
-  ON_CALL_HELD: string;
-  ON_CALL_UNHELD: string;
-  ON_CAMERA_DISABLED: string;
-  ON_CAMERA_RESUMED: string;
-  ON_CALL_CANCELED: string;
-  ON_CALL_FAILED: string;
-  ON_CALL_REJECTED: string;
-  ON_CALL_ENDED: string;
-  ON_CALL_ENDING: string;
-  ON_MESSAGE: string;
-  ON_REINVITE: string;
-  ON_TRACK: string;
-  ON_AUDIO_STREAM: string;
-  ON_VIDEO_STREAM: string;
-  ON_REMOVE_STREAM: string;
-  ON_SHARE_SCREEN_STARTED: string;
-  ON_SHARE_SCREEN_ENDING: string;
-  ON_SHARE_SCREEN_ENDED: string;
-  ON_TERMINATE_SOUND: string;
-  ON_PLAY_RING_SOUND: string;
-  ON_PLAY_INBOUND_CALL_SIGNAL_SOUND: string;
-  ON_PLAY_HANGUP_SOUND: string;
-  ON_PLAY_PROGRESS_SOUND: string;
-  ON_VIDEO_INPUT_CHANGE: string;
-  ON_CALL_ERROR: string;
-  ON_MESSAGE_TRACK_UPDATED: string;
-  ON_NETWORK_STATS: string;
-  ON_CHAT: string;
-  ON_SIGNAL: string;
-  ON_DISCONNECTED: string;
-  ON_EARLY_MEDIA: string;
-  MESSAGE_TYPE_CHAT: string;
-  MESSAGE_TYPE_SIGNAL: string;
-
-  connect: (options: Partial<ConnectionOptions>, sipLine?: SipLine | null | undefined) => Promise<void>;
-  connectWithCredentials: (server: string, sipLine: SipLine, displayName: string, rawOptions: Partial<ConnectionOptions>) => void;
-  disconnect: () => Promise<void>;
-  call: (extension: string, withCamera: boolean, rawSipLine: SipLine | null | undefined, audioOnly: boolean, conference: boolean) => Promise<CallSession | null | undefined>;
-  hangup: (callSession: CallSession) => Promise<boolean> ;
-  startConference: (host: CallSession, otherCalls: CallSession[]) => Promise<AdHocAPIConference>;
-  mute: (callSession: CallSession, withApi?: boolean) => void;
-  unmute: (callSession: CallSession, withApi?: boolean) => void;
-  muteViaAPI: (callSession: CallSession) => void;
-  unmuteViaAPI: (callSession: CallSession) => void;
-  hold: (callSession: CallSession) => Promise<void | OutgoingInviteRequest> | null | undefined;
-  unhold: (callSession: CallSession) => Promise<MediaStream | void | null | undefined>;
-  resume: (callSession: CallSession) => Promise<MediaStream | null | void>;
-  reject: (callSession: CallSession) => Promise<void> | undefined;
-  transfer: (callSession: CallSession, target: string) => void;
-  atxfer: (callSession: CallSession) => Record<string, any> | null;
-  reinvite: (callSession: CallSession, constraints: (Record<string, any> | null), conference: boolean) => Promise<OutgoingInviteRequest | void | null>;
-  getStats: (callSession: CallSession) => Promise<RTCStatsReport | null | undefined>;
-  startNetworkMonitoring: (callSession: CallSession, interval: number) => void;
-  stopNetworkMonitoring: (callSession: CallSession) => void;
-  getSipSessionId: (sipSession: Invitation | Inviter) => string | null | undefined;
-  sendMessage: (body: string, sipSession?: Inviter | Invitation, contentType?: string) => void;
-  sendChat: (content: string, sipSession?: Inviter | Invitation) => void;
-  sendSignal: (content: any, sipSession?: Inviter | Invitation) => void ;
-  turnCameraOff: (callSession: CallSession) => void;
-  turnCameraOn: (callSession: CallSession) => void;
-  startScreenSharing: (constraints: Record<string, any>, callSession?: CallSession) => Promise<MediaStream | null>;
-  stopScreenSharing: (callSession?: CallSession, restoreLocalStream?: boolean) => Promise<OutgoingInviteRequest | void | null>;
-  sendDTMF: (tone: string, callSession: CallSession) => void;
-  getLocalStream: (callSession: CallSession) => MediaStream | null | undefined ;
-  hasLocalVideo: (callSession: CallSession) => boolean;
-  hasALocalVideoTrack: (callSession: CallSession) => boolean;
-  getLocalMediaStream: (callSession: CallSession) => MediaStream | null | undefined;
-  getLocalVideoStream: (callSession: CallSession) => MediaStream | null;
-  getRemoteStream: (callSession: CallSession) => MediaStream | null;
-  getRemoteVideoStream: (callSession: CallSession) => MediaStream | null ;
-  isVideoRemotelyHeld: (callSession: CallSession) => boolean;
-  getRemoteStreamForCall: (callSession: CallSession) => MediaStream | null;
-  getRemoteStreamsForCall: (callSession: CallSession) => MediaStream | null;
-  getRemoteVideoStreamForCall: (callSession: CallSession) => MediaStream | null;
-  getRemoteVideoStreamFromPc: (callSession: CallSession) => MediaStream | null;
-  hasVideo: (callSession: CallSession) => boolean;
-  hasAVideoTrack: (callSession: CallSession) => boolean;
-  getCurrentSipSession: () => Invitation | Inviter | null;
-  getPrimaryWebRtcLine: () => SipLine | null;
-  getOutputDevice: () => string | null ;
-  getPrimaryLine: () => SipLine | null;
-  getLineById: (lineId: string) => SipLine | null;
-  getSipLines: () => SipLine[];
-  hasSfu: () => boolean;
-  checkSfu: () => void;
-  _transferEvents: () => void;
-}
-
-class Phone extends Emitter implements IPhone {
+class Phone extends Emitter {
   client: WazoWebRTCClient;
 
   phone: WebRTCPhone | null | undefined;
@@ -228,7 +121,7 @@ class Phone extends Emitter implements IPhone {
     super();
     // Sugar syntax for `Wazo.Phone.EVENT_NAME`
     Object.keys(PHONE_EVENTS).forEach((key: string) => {
-      // @ts-ignore
+      // @ts-ignore: keys
       this[key] = PHONE_EVENTS[key];
     });
     this.SessionState = SessionState;
@@ -435,14 +328,14 @@ class Phone extends Emitter implements IPhone {
     return this.phone ? this.phone.stopNetworkMonitoring(callSession) : null;
   }
 
-  getSipSessionId(sipSession: Invitation | Inviter): string | null | undefined {
+  getSipSessionId(sipSession: WazoSession): string | null | undefined {
     if (!sipSession || !this.phone) {
       return null;
     }
     return this.phone.getSipSessionId(sipSession);
   }
 
-  sendMessage(body: string, sipSession?: Inviter | Invitation, contentType = 'text/plain'): void {
+  sendMessage(body: string, sipSession?: WazoSession, contentType = 'text/plain'): void {
     const toSipSession = sipSession || this.getCurrentSipSession();
 
     if (!toSipSession || !this.phone) {
@@ -452,14 +345,14 @@ class Phone extends Emitter implements IPhone {
     this.phone.sendMessage(toSipSession, body, contentType);
   }
 
-  sendChat(content: string, sipSession?: Inviter | Invitation): void {
+  sendChat(content: string, sipSession?: WazoSession): void {
     this.sendMessage(JSON.stringify({
       type: MESSAGE_TYPE_CHAT,
       content,
     }), sipSession, 'application/json');
   }
 
-  sendSignal(content: any, sipSession?: Inviter | Invitation): void {
+  sendSignal(content: any, sipSession?: WazoSession): void {
     this.sendMessage(JSON.stringify({
       type: MESSAGE_TYPE_SIGNAL,
       content,
@@ -552,7 +445,7 @@ class Phone extends Emitter implements IPhone {
     return this.phone ? this.phone.hasAVideoTrack(callSession) : false;
   }
 
-  getCurrentSipSession(): Invitation | Inviter | null {
+  getCurrentSipSession(): WazoSession | null {
     return this.phone?.currentSipSession || null;
   }
 

package/src/simple/Websocket.ts

@@ -1,6 +1,6 @@
 import type Session from '../domain/Session';
 import WazoWebSocketClient, * as WebSocketClient from '../websocket-client';
-import Emitter, { IEmitter } from '../utils/Emitter';
+import Emitter from '../utils/Emitter';
 import IssueReporter from '../service/IssueReporter';
 import { obfuscateToken } from '../utils/string';
 
@@ -11,23 +11,7 @@ const {
 const ALL_EVENTS = [...Object.values(SOCKET_EVENTS), ...Object.values(OTHER_EVENTS)];
 const logger = IssueReporter.loggerFor('simple-ws-client');
 
-export interface IWebsocket extends IEmitter {
-  ws: WazoWebSocketClient | null | undefined;
-  eventLists: string[];
-
-  CONFERENCE_USER_PARTICIPANT_JOINED: string;
-  CONFERENCE_USER_PARTICIPANT_LEFT: string;
-  MEETING_USER_PARTICIPANT_JOINED: string;
-  MEETING_USER_PARTICIPANT_LEFT: string;
-  CALL_CREATED: string;
-
-  open: (host: string, session: Session) => void;
-  updateToken: (token: string) => void;
-  isOpen: () => boolean;
-  close: (force?: boolean) => void;
-}
-
-class Websocket extends Emitter implements IWebsocket {
+class Websocket extends Emitter {
   ws: WazoWebSocketClient | null | undefined;
 
   eventLists: string[];
@@ -46,11 +30,11 @@ class Websocket extends Emitter implements IWebsocket {
     super();
     // Sugar syntax for `Wazo.WebSocket.EVENT_NAME`
     Object.keys(OTHER_EVENTS).forEach(key => {
-      // @ts-ignore
+      // @ts-ignore: keys
       this[key] = OTHER_EVENTS[key];
     });
     Object.keys(SOCKET_EVENTS).forEach(key => {
-      // @ts-ignore
+      // @ts-ignore: keys
       this[key] = SOCKET_EVENTS[key];
     });
     this.eventLists = WazoWebSocketClient.eventLists;

package/src/simple/index.ts

@@ -1,11 +1,12 @@
 /* global window */
-import Auth, { IAuth, InvalidSubscription, InvalidAuthorization, NoTenantIdError, NoDomainNameError } from './Auth';
-import Phone, { IPhone } from './Phone';
-import Websocket, { IWebsocket } from './Websocket';
+import Auth, { InvalidSubscription, InvalidAuthorization, NoTenantIdError, NoDomainNameError } from './Auth';
+import Phone from './Phone';
+import Websocket from './Websocket';
 import Room from './room/Room';
 import SipRoom from './room/SipRoom';
 import RemoteParticipant from './room/RemoteParticipant';
 import LocalParticipant from './room/LocalParticipant';
+import Participant from './room/Participant';
 import Stream from './room/Stream';
 import Directory from './Directory';
 import Configuration from './Configuration';
@@ -40,13 +41,14 @@ import Meeting from '../domain/Meeting';
 import Checker from '../checker/Checker';
 
 const Wazo = {
-  Auth: Auth as IAuth,
-  Phone: Phone as IPhone,
-  Websocket: Websocket as IWebsocket,
+  Auth,
+  Phone,
+  Websocket,
   Room,
   SipRoom,
   RemoteParticipant,
   LocalParticipant,
+  Participant,
   Stream,
   createLocalVideoStream,
   createLocalAudioStream,
@@ -138,7 +140,6 @@ const Wazo = {
 };
 
 if (window) {
-  // @ts-ignore
   window.Wazo = Wazo;
 }
 

package/src/simple/room/Participant.ts

@@ -4,6 +4,7 @@ import Phone from '../Phone';
 import Room, { SIGNAL_TYPE_PARTICIPANT_UPDATE } from './Room';
 import Contact from '../../domain/Contact';
 import getApiClient from '../../service/getApiClient';
+import Stream from './Stream';
 
 const logger = IssueReporter.loggerFor('room');
 
@@ -27,9 +28,9 @@ class Participant extends Emitter {
 
   isTalking: boolean;
 
-  streams: any[];
+  streams: Stream[];
 
-  videoStreams: any[];
+  videoStreams: Stream[];
 
   audioMuted: boolean;
 
@@ -371,7 +372,7 @@ class Participant extends Emitter {
     });
   }
 
-  resetStreams(streams: any[]) {
+  resetStreams(streams: Stream[]) {
     this.streams = streams;
     this.videoStreams = streams;
   }

package/src/simple/room/Room.ts

@@ -1,6 +1,6 @@
 import type { Message } from 'sip.js/lib/api/message';
 import sdpParser from 'sdp-transform';
-import { Invitation, Inviter } from 'sip.js';
+import { SessionDescriptionHandler } from 'sip.js/lib/platform/web';
 import type CallSession from '../../domain/CallSession';
 import getApiClient from '../../service/getApiClient';
 import Emitter from '../../utils/Emitter';
@@ -9,11 +9,21 @@ import Participant, { RawParticipant } from './Participant';
 import RemoteParticipant from './RemoteParticipant';
 import IssueReporter from '../../service/IssueReporter';
 import LocalParticipant from './LocalParticipant';
+import { PeerConnection, WazoSession } from '../../domain/types';
 
 export const SIGNAL_TYPE_PARTICIPANT_UPDATE = 'signal/PARTICIPANT_UPDATE';
 export const SIGNAL_TYPE_PARTICIPANT_REQUEST = 'signal/PARTICIPANT_REQUEST';
 const logger = IssueReporter.loggerFor('sdk-room');
 
+type ConnectArgs = {
+  extension: string;
+  constraints: Record<string, any>;
+  audioOnly?: boolean;
+  extra?: Record<string, any>;
+  room: Room;
+  meeting: any;
+};
+
 class Room extends Emitter {
   callSession: CallSession | null | undefined;
 
@@ -31,13 +41,13 @@ class Room extends Emitter {
 
   connected: boolean;
 
-  localParticipant: Participant | null | undefined;
+  localParticipant: LocalParticipant | null | undefined;
 
   _callIdStreamIdMap: Record<string, any>;
 
-  _unassociatedVideoStreams: Record<string, any>;
+  _unassociatedVideoStreams: Record<string, MediaStream>;
 
-  _unassociatedParticipants: Record<string, any>;
+  _unassociatedParticipants: Record<string, Participant>;
 
   _boundOnParticipantJoined: (...args: Array<any>) => any;
 
@@ -53,12 +63,12 @@ class Room extends Emitter {
 
   _boundOnReinvite: (...args: Array<any>) => any;
 
-  audioStream: any | null | undefined;
+  audioStream: MediaStream | null | undefined;
 
   extra: Record<string, any>;
 
   // video tag representing the room audio stream
-  roomAudioElement: any;
+  roomAudioElement: HTMLAudioElement;
 
   CONFERENCE_USER_PARTICIPANT_JOINED: string;
 
@@ -170,7 +180,7 @@ class Room extends Emitter {
     extra,
     room,
     meeting,
-  }: Record<string, any>) {
+  }: ConnectArgs) {
     logger.info('connecting to room', {
       extension,
       audioOnly,
@@ -190,7 +200,7 @@ class Room extends Emitter {
       // Call_created is triggered before call_accepted, so we have to listen for it here.
       Wazo.Websocket.once(Wazo.Websocket.CALL_CREATED, ({
         data,
-      }) => {
+      }: { data: Record<string, any> }) => {
         logger.info('room call received via WS', {
           callId: data.call_id,
         });
@@ -200,8 +210,9 @@ class Room extends Emitter {
         }
       });
       const callSession = await Wazo.Phone.call(extension, withCamera, null, audioOnly, true);
+      // @ts-fix: heads up: added an extra `null` here
       // eslint-disable-next-line no-param-reassign
-      room = new Room(callSession as CallSession, extension, null, null, extra);
+      room = new Room(callSession as CallSession, extension, null, null, null, extra);
       // Wait for the call to be accepted
       await new Promise((resolve, reject) => {
         Wazo.Phone.once(Wazo.Phone.ON_CALL_ACCEPTED, resolve);
@@ -226,8 +237,8 @@ class Room extends Emitter {
       });
 
       if (conference) {
-        room.setSourceId(conference.sourceId);
-        room.setName(conference.name);
+        room.setSourceId(parseInt(`${conference.sourceId}`, 10));
+        room.setName(`${conference.name}`);
       }
     } else if (meeting) {
       logger.info('Already connected to meeting', {
@@ -467,8 +478,7 @@ class Room extends Emitter {
     }
 
     // Retrieve mapping
-    // @ts-ignore
-    Wazo.Phone.phone.currentSipSession.sessionDescriptionHandler.on('setDescription', ({
+    (Wazo.Phone.phone.currentSipSession.sessionDescriptionHandler as SessionDescriptionHandler & { on: (input: string, options?: Record<string, any>) => void })?.on('setDescription', ({
       type,
       sdp: rawSdp,
     }: any) => {
@@ -486,7 +496,7 @@ class Room extends Emitter {
       this.audioStream = stream;
 
       if (!this.roomAudioElement) {
-        const sessionId = Wazo.Phone.phone?.getSipSessionId(Wazo.Phone.phone?.currentSipSession as Inviter | Invitation);
+        const sessionId = Wazo.Phone.phone?.getSipSessionId(Wazo.Phone.phone?.currentSipSession as WazoSession);
         this.roomAudioElement = Wazo.Phone.phone?.createAudioElementFor(sessionId as string);
         this.roomAudioElement.srcObject = stream;
       } else {
@@ -546,13 +556,11 @@ class Room extends Emitter {
 
   _mapMsid(rawSdp: string) {
     const sdp = sdpParser.parse(rawSdp);
-    const labelMsidArray = sdp.media.filter((media: any) => !!media.label).map(({
-      label,
-      msid,
-    }: any) => ({
+    // @ts-ignore: Property 'label' does not exist
+    const labelMsidArray = sdp.media.filter((media) => !!media.label).map(({ label, msid }) => ({
       label: String(label),
-      streamId: msid.split(' ')[0],
-      trackId: msid.split(' ')[1],
+      streamId: msid?.split(' ')[0],
+      trackId: msid?.split(' ')[1],
     }));
     labelMsidArray.forEach(({
       label,
@@ -583,21 +591,19 @@ class Room extends Emitter {
     Wazo.Phone.on(this.ON_CHAT, this._boundOnChat);
     Wazo.Phone.on(this.ON_SIGNAL, this._boundOnSignal);
     Wazo.Phone.on(this.ON_VIDEO_INPUT_CHANGE, this._boundSaveLocalVideoStream);
-    [this.ON_AUDIO_STREAM, this.ON_VIDEO_STREAM, this.ON_REMOVE_STREAM].forEach(event => Wazo.Phone.on(event, (...args) => this.eventEmitter.emit.apply(this.eventEmitter, [event, ...args])));
+    [this.ON_AUDIO_STREAM, this.ON_VIDEO_STREAM, this.ON_REMOVE_STREAM].forEach(event => Wazo.Phone.on(event, (...args: any[]) => this.eventEmitter.emit.apply(this.eventEmitter, [event, ...args])));
   }
 
-  _onMessage(message: Message): Record<string, any> | null | undefined {
-    // @ts-ignore
+  _onMessage(message: Message & { method?: string, body?: string }): Record<string, any> | null | undefined {
     if (message.method !== 'MESSAGE') {
       return null;
     }
 
-    let body: any;
+    let body;
 
     try {
-      // @ts-ignore
-      body = JSON.parse(message.body);
-    } catch (e: any) {
+      body = JSON.parse(message.body as string);
+    } catch (e) {
       return null;
     }
 
@@ -731,7 +737,7 @@ class Room extends Emitter {
           });
           response = await getApiClient().calld.getConferenceParticipantsAsUser(conferenceId);
         }
-      } catch (e: any) {
+      } catch (e) {
         logger.error('room participants fetching, error', e);
       }
 
@@ -744,7 +750,7 @@ class Room extends Emitter {
           return isMe && item.call_id ? new Wazo.LocalParticipant(this, item, this.extra) : new Wazo.RemoteParticipant(this, item);
         });
         this.participants = participants;
-        const localParticipant = participants.find((someParticipant: any) => someParticipant instanceof Wazo.LocalParticipant);
+        const localParticipant = participants.find((someParticipant: Participant) => someParticipant instanceof Wazo.LocalParticipant);
 
         if (!this.localParticipant && localParticipant) {
           this._onLocalParticipantJoined(localParticipant);
@@ -839,10 +845,10 @@ class Room extends Emitter {
       trackId,
       streamId,
     } = this._callIdStreamIdMap[newParticipant.callId] || {};
-    // @ts-ignore
-    const pc = Wazo.Phone.phone.currentSipSession.sessionDescriptionHandler.peerConnection;
+
+    const pc = (Wazo.Phone.phone?.currentSipSession?.sessionDescriptionHandler as SessionDescriptionHandler)?.peerConnection as PeerConnection;
     // Can't use `getReceivers` here because on FF we make the mapping based on the streamId
-    const stream = pc.getRemoteStreams().find((someStream: any) => someStream.id === streamId || someStream.getTracks().some((track: any) => track.id === trackId));
+    const stream = pc.getRemoteStreams().find(someStream => someStream.id === streamId || someStream.getTracks().some(track => track.id === trackId));
 
     if (update === 'downgrade') {
       newParticipant.resetStreams([]);
@@ -875,15 +881,17 @@ class Room extends Emitter {
 
     const streamId = this._getStreamIdFrTrackId(trackId);
 
-    const key: any = this._getUnassociatedMapIdFromTrackIdOrStreamId(trackId, streamId);
+    const key = this._getUnassociatedMapIdFromTrackIdOrStreamId(trackId, streamId);
 
-    const stream = this._unassociatedVideoStreams[key];
+    const stream = key ? this._unassociatedVideoStreams[key] : null;
 
     if (stream) {
       // Try to associate stream
       this._associateStreamTo(stream, participant);
 
-      delete this._unassociatedVideoStreams[key];
+      if (key) {
+        delete this._unassociatedVideoStreams[key];
+      }
       delete this._unassociatedParticipants[participant.callId];
     }
   }
@@ -909,7 +917,7 @@ class Room extends Emitter {
     return mapping ? mapping.streamId : null;
   }
 
-  _associateStreamTo(rawStream: any, participant: Participant) {
+  _associateStreamTo(rawStream: MediaStream, participant: Participant) {
     const stream = new Wazo.Stream(rawStream, participant);
     participant.streams.push(stream);
     participant.videoStreams.push(stream);

package/src/simple/room/SipRoom.ts

@@ -1,9 +1,9 @@
-import { Invitation, Inviter } from 'sip.js';
 import type { Message } from 'sip.js/lib/api/message';
 import CallSession from '../../domain/CallSession';
 import IssueReporter from '../../service/IssueReporter';
 import Wazo from '../index';
 import Room from './Room';
+import { WazoSession } from '../../domain/types';
 
 const logger = IssueReporter.loggerFor('sdk-sip-room');
 
@@ -54,7 +54,7 @@ class SipRoom extends Room {
   }
 
   getLocalGuestName(): string | null {
-    // @ts-ignore
+    // @ts-ignore: private
     return Wazo.Phone.phone?.client.userAgent?.options.displayName || null;
   }
 
@@ -65,7 +65,7 @@ class SipRoom extends Room {
     Wazo.Phone.on(this.ON_CHAT, this._boundOnChat);
     Wazo.Phone.on(this.ON_SIGNAL, this._boundOnSignal);
     Wazo.Phone.on(this.ON_VIDEO_INPUT_CHANGE, this._boundSaveLocalVideoStream);
-    [this.ON_AUDIO_STREAM, this.ON_VIDEO_STREAM, this.ON_REMOVE_STREAM].forEach(event => Wazo.Phone.on(event, (...args) => this.eventEmitter.emit.apply(this.eventEmitter, [event, ...args])));
+    [this.ON_AUDIO_STREAM, this.ON_VIDEO_STREAM, this.ON_REMOVE_STREAM].forEach(event => Wazo.Phone.on(event, (...args: any[]) => this.eventEmitter.emit.apply(this.eventEmitter, [event, ...args])));
   }
 
   _onMessage(message: Message): Record<string, any> | null | undefined {
@@ -156,7 +156,7 @@ class SipRoom extends Room {
   }
 
   _getCurrentSipCallIs() {
-    return Wazo.Phone.getSipSessionId(Wazo.Phone.phone?.currentSipSession as Invitation | Inviter);
+    return Wazo.Phone.getSipSessionId(Wazo.Phone.phone?.currentSipSession as WazoSession);
   }
 
 }

package/src/simple/room/Stream.ts

@@ -9,7 +9,7 @@ class Stream {
 
   participant: Participant | undefined;
 
-  static detachStream(stream: any) {
+  static detachStream(stream: MediaStream) {
     stream.getTracks()
       .filter((track: MediaStreamTrack) => track.enabled)
       .forEach((track: MediaStreamTrack) => track.stop());
@@ -34,9 +34,8 @@ class Stream {
 
     element.onloadedmetadata = () => {
       const tracks = this.htmlStream ? this.htmlStream.getVideoTracks() : [];
-      tracks.forEach(track => {
+      tracks.forEach((track: MediaStreamTrack & { loaded?: boolean }) => {
         track.enabled = true;
-        // @ts-ignore
         track.loaded = true;
       });
     };

package/src/simple/room/__tests__/Participant.test.ts

@@ -26,8 +26,7 @@ describe('Participant', () => {
       const room = new Room();
       room.setMeetingUuid(meetingUuid);
       const banMeetingParticipant = jest.fn();
-      // @ts-expect-error
-      getApiClient.mockImplementation(() => ({
+      (getApiClient as any).mockImplementation(() => ({
         calld: {
           banMeetingParticipant,
         },
@@ -52,8 +51,7 @@ describe('Participant', () => {
       const room = new Room();
       room.setMeetingUuid(meetingUuid);
       const banMeetingParticipant = jest.fn();
-      // @ts-expect-error
-      getApiClient.mockImplementation(() => ({
+      (getApiClient as any).mockImplementation(() => ({
         calld: {
           banMeetingParticipant,
         },

package/src/simple/room/__tests__/RemoteParticipant.test.ts

@@ -1,14 +1,15 @@
 // Using directly Wazo to avoid issues with require cycle
 import Wazo from '../../index';
+import { RawParticipant } from '../Participant';
+import Room from '../Room';
 
 describe('RemoteParticipant', () => {
   it('should fall back on number when name is <unknown>', () => {
     const number = '1234';
-    // @ts-expect-error
-    const participant = new Wazo.RemoteParticipant(null, {
+    const participant = new Wazo.RemoteParticipant({} as Room, {
       caller_id_name: '<unknown>',
       caller_id_number: number,
-    });
+    } as RawParticipant);
     expect(participant.name).toEqual(number);
   });
 });

package/src/types/wazo.d.ts

@@ -0,0 +1 @@
+declare module '@wazo/sdk';

package/src/utils/PhoneNumberUtil.ts

@@ -59,7 +59,7 @@ const getDisplayableNumber = (rawNumber: string, country: string, asYouType = fa
 
 const parsePhoneNumber = (phoneNumber: string): string => phoneNumber.replace(EXTRA_CHAR_REGEXP, '');
 
-const getCallableNumber = (number: string, country: string | null | undefined): string | null | undefined => {
+const getCallableNumber = (number: string, country?: string | null): string | null | undefined => {
   try {
     if (country) {
       return getDisplayableNumber(number, country).replace(EXTRA_CHAR_REGEXP, '');

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

@@ -44,17 +44,11 @@ describe('getCallableNumber', () => {
     expect(getCallableNumber('9000', 'US')).toBe('9000');
   });
   it('works without a country', () => {
-    // @ts-expect-error
     expect(getCallableNumber('06 75 45')).toBe('067545');
-    // @ts-expect-error
     expect(getCallableNumber('067-545')).toBe('067545');
-    // @ts-expect-error
     expect(getCallableNumber('8008')).toBe('8008');
-    // @ts-expect-error
     expect(getCallableNumber('80.08')).toBe('8008');
-    // @ts-expect-error
     expect(getCallableNumber('*10')).toBe('*10');
-    // @ts-expect-error
     expect(getCallableNumber('9000')).toBe('9000');
   });
 });