diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/views/webcam/WebCamLogic.js | 6 | ||||
| -rw-r--r-- | src/server/Websocket/Websocket.ts | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/client/views/webcam/WebCamLogic.js b/src/client/views/webcam/WebCamLogic.js index ffdcc4241..37d152cc7 100644 --- a/src/client/views/webcam/WebCamLogic.js +++ b/src/client/views/webcam/WebCamLogic.js @@ -260,7 +260,9 @@ export function hangup() { function stop() { isStarted = false; - pc.close(); + if (pc) { + pc.close(); + } pc = null; } @@ -275,5 +277,5 @@ function handleRemoteHangup() { function sendMessage(message) { console.log('Client sending message: ', message); - socket.emit('message', message); + socket.emit('message', message, room); };
\ No newline at end of file diff --git a/src/server/Websocket/Websocket.ts b/src/server/Websocket/Websocket.ts index 30e7d6129..9a6ed8221 100644 --- a/src/server/Websocket/Websocket.ts +++ b/src/server/Websocket/Websocket.ts @@ -10,7 +10,8 @@ import { GoogleCredentialsLoader } from "../credentials/CredentialsLoader"; import { logPort } from "../ActionUtilities"; import { timeMap } from "../ApiManagers/UserManager"; import { green } from "colors"; -import { networkInterfaces } from "os"; +import { networkInterfaces, type } from "os"; +import { object } from "serializr"; export namespace WebSocket { @@ -46,10 +47,9 @@ export namespace WebSocket { socket.emit('log', ['Message from server:', message, ...optionalParams]); } - socket.on('message', function (message) { + socket.on('message', function (message, room) { console.log('Client said: ', message); - // for a real app, would be room-only (not broadcast) - socket.broadcast.emit('message', message); + socket.in(room).emit('message', message); }); socket.on('create or join', function (room) { |