Merge branch 'develop' of github.com:thecodingmachine/workadventure into outline

front/src/Connection.ts

@@ -6,12 +6,12 @@ import {SetPlayerDetailsMessage} from "./Messages/SetPlayerDetailsMessage";
 const SocketIo = require('socket.io-client');
 import Socket = SocketIOClient.Socket;
 import {PlayerAnimationNames} from "./Phaser/Player/Animation";
-import {UserSimplePeer} from "./WebRtc/SimplePeer";
+import {UserSimplePeerInterface} from "./WebRtc/SimplePeer";
 import {SignalData} from "simple-peer";
 
-
 enum EventMessage{
     WEBRTC_SIGNAL = "webrtc-signal",
+    WEBRTC_SCREEN_SHARING_SIGNAL = "webrtc-screen-sharing-signal",
     WEBRTC_START = "webrtc-start",
     JOIN_ROOM = "join-room", // bi-directional
     USER_POSITION = "user-position", // bi-directional
@@ -73,17 +73,20 @@ export interface GroupCreatedUpdatedMessageInterface {
 
 export interface WebRtcStartMessageInterface {
     roomId: string,
-    clients: UserSimplePeer[]
+    clients: UserSimplePeerInterface[]
 }
 
 export interface WebRtcDisconnectMessageInterface {
     userId: string
 }
 
-export interface WebRtcSignalMessageInterface {
-    userId: string,
+export interface WebRtcSignalSentMessageInterface {
     receiverId: string,
-    roomId: string,
+    signal: SignalData
+}
+
+export interface WebRtcSignalReceivedMessageInterface {
+    userId: string,
     signal: SignalData
 }
 
@@ -201,23 +204,32 @@ export class Connection implements Connection {
         this.socket.on(EventMessage.CONNECT_ERROR, callback)
     }
 
-    public sendWebrtcSignal(signal: unknown, roomId: string, userId? : string|null, receiverId? : string) {
+    public sendWebrtcSignal(signal: unknown, receiverId : string) {
         return this.socket.emit(EventMessage.WEBRTC_SIGNAL, {
-            userId: userId ? userId : this.userId,
-            receiverId: receiverId ? receiverId : this.userId,
-            roomId: roomId,
+            receiverId: receiverId,
             signal: signal
-        });
+        } as WebRtcSignalSentMessageInterface);
+    }
+
+    public sendWebrtcScreenSharingSignal(signal: unknown, receiverId : string) {
+        return this.socket.emit(EventMessage.WEBRTC_SCREEN_SHARING_SIGNAL, {
+            receiverId: receiverId,
+            signal: signal
+        } as WebRtcSignalSentMessageInterface);
     }
 
     public receiveWebrtcStart(callback: (message: WebRtcStartMessageInterface) => void) {
         this.socket.on(EventMessage.WEBRTC_START, callback);
     }
 
-    public receiveWebrtcSignal(callback: (message: WebRtcSignalMessageInterface) => void) {
+    public receiveWebrtcSignal(callback: (message: WebRtcSignalReceivedMessageInterface) => void) {
         return this.socket.on(EventMessage.WEBRTC_SIGNAL, callback);
     }
 
+    public receiveWebrtcScreenSharingSignal(callback: (message: WebRtcSignalReceivedMessageInterface) => void) {
+        return this.socket.on(EventMessage.WEBRTC_SCREEN_SHARING_SIGNAL, callback);
+    }
+
     public onServerDisconnected(callback: (reason: string) => void): void {
         this.socket.on('disconnect', (reason: string) => {
             if (reason === 'io client disconnect') {