Skip to content
Snippets Groups Projects
Commit 521088ec authored by Simon Döring's avatar Simon Döring
Browse files

Disconnect sender socket when slot is deactivated

parent 0ef7d89b
No related branches found
No related tags found
No related merge requests found
import { socketIO } from '../../socket-io/socket-io'; import { socketIO } from '../../socket-io/socket-io';
import { cameraSlotState } from '../../state/camera-slot-state'; import { cameraSlotState } from '../../state/camera-slot-state';
import { import {
emitRemoveFeed,
emitSetAnnotation, emitSetAnnotation,
emitRemoveAnnotation emitRemoveAnnotation
} from '../../socket-io/handlers/common-handlers'; } from '../../socket-io/handlers/common-handlers';
import { emitControllerBitrateLimit } from '../../socket-io/handlers/sender-handlers'; import {
disconnectSocket,
emitControllerBitrateLimit
} from '../../socket-io/handlers/sender-handlers';
import { setBitrate } from '../../janus/handlers'; import { setBitrate } from '../../janus/handlers';
import { config } from '../../config/config'; import { config } from '../../config/config';
...@@ -63,7 +65,9 @@ const handleInternalCommand = ( ...@@ -63,7 +65,9 @@ const handleInternalCommand = (
return; return;
} }
console.log('Deactivating slot ' + slot); console.log('Deactivating slot ' + slot);
emitRemoveFeed(slot); if (currentCameraState.feedActive) {
disconnectSocket(currentCameraState.senderSocketId!);
}
currentCameraState.slotActive = false; currentCameraState.slotActive = false;
currentCameraState.token = null; currentCameraState.token = null;
......
...@@ -8,6 +8,15 @@ import { setBitrate } from '../../janus/handlers'; ...@@ -8,6 +8,15 @@ import { setBitrate } from '../../janus/handlers';
import { socketIO } from '../socket-io'; import { socketIO } from '../socket-io';
import { config } from '../../config/config'; import { config } from '../../config/config';
export const disconnectSocket = (socketId: string) => {
const socket = socketIO.sockets.sockets.get(socketId);
if (socket) {
socket.disconnect();
} else {
console.log('Error: Tried to disconnect socket that does not exist');
}
};
export const emitControllerBitrateLimit = ( export const emitControllerBitrateLimit = (
socketId: string, socketId: string,
bitrateLimit: number bitrateLimit: number
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment