From 6c5772e84986187b568d39a4e6a709696e99a033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Tue, 18 Aug 2020 15:31:42 +0200 Subject: [PATCH] Fixing typipng in back --- back/src/Controller/IoSocketController.ts | 2 +- back/src/Model/Websocket/WebRtcSignalMessage.ts | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/back/src/Controller/IoSocketController.ts b/back/src/Controller/IoSocketController.ts index 0c1956f3..923f36a9 100644 --- a/back/src/Controller/IoSocketController.ts +++ b/back/src/Controller/IoSocketController.ts @@ -301,7 +301,7 @@ export class IoSocketController { console.warn('Invalid WEBRTC_SIGNAL message received: ', data); return; } - if(data && data.signal && (data.signal as any).type === "offer"){ + if(data.signal.type === "offer"){ let roomOffer = this.offerScreenSharingByClient.get(data.roomId); if(!roomOffer){ roomOffer = new Map(); diff --git a/back/src/Model/Websocket/WebRtcSignalMessage.ts b/back/src/Model/Websocket/WebRtcSignalMessage.ts index 8236d338..56a19060 100644 --- a/back/src/Model/Websocket/WebRtcSignalMessage.ts +++ b/back/src/Model/Websocket/WebRtcSignalMessage.ts @@ -1,17 +1,22 @@ import * as tg from "generic-type-guard"; +export const isSignalData = + new tg.IsInterface().withProperties({ + type: tg.isOptional(tg.isString) + }).get(); + export const isWebRtcSignalMessageInterface = new tg.IsInterface().withProperties({ userId: tg.isString, receiverId: tg.isString, roomId: tg.isString, - signal: tg.isUnknown + signal: isSignalData }).get(); export const isWebRtcScreenSharingSignalMessageInterface = new tg.IsInterface().withProperties({ userId: tg.isString, roomId: tg.isString, - signal: tg.isUnknown + signal: isSignalData }).get(); export const isWebRtcScreenSharingStartMessageInterface = new tg.IsInterface().withProperties({ @@ -19,3 +24,4 @@ export const isWebRtcScreenSharingStartMessageInterface = roomId: tg.isString }).get(); export type WebRtcSignalMessageInterface = tg.GuardedType; +export type WebRtcScreenSharingMessageInterface = tg.GuardedType;