From f574c9db1337fb8849f0a00c8b270e84aa61f861 Mon Sep 17 00:00:00 2001 From: cv <34649812+cpvalente@users.noreply.github.com> Date: Thu, 22 Apr 2021 14:31:43 +0200 Subject: [PATCH] cleanup --- server/classes/EventTimer.js | 103 ++++++++++++----- server/controllers/socketController.js | 150 ------------------------- 2 files changed, 77 insertions(+), 176 deletions(-) delete mode 100644 server/controllers/socketController.js diff --git a/server/classes/EventTimer.js b/server/classes/EventTimer.js index 740c082b7..6e8436ff3 100644 --- a/server/classes/EventTimer.js +++ b/server/classes/EventTimer.js @@ -59,7 +59,10 @@ class EventTimer extends Timer { }); // set recurrent emits - this._interval = setInterval(() => this.broadcastTimer(), config.timer.refresh); + this._interval = setInterval( + () => this.broadcastTimer(), + config.timer.refresh + ); // listen to new connections this._listenToConnections(); @@ -75,6 +78,63 @@ class EventTimer extends Timer { this.io.emit(address, payload); } + _setterManager(action, payload) { + switch (action) { + /*******************************************/ + // playstate + case 'set-playstate': + // check state is defined + if (payload === 'start') this.start(); + else if (payload === 'pause') this.pause(); + else if (payload === 'stop') this.stop(); + else if (payload === 'previous') this.previous(); + else if (payload === 'next') this.next(); + // Not yet implemented + // else if (payload === 'roll') this.roll(); + // else if (payload === 'release') this.roll(); + this.broadcastThis('playstate', this.playState); + this.broadcastThis('selected-id', this.selectedEventId); + this.broadcastThis('titles', this.titles); + break; + + /*******************************************/ + // Presenter message + case 'set-presenter-text': + this.presenter.text = payload; + this.broadcastThis('messages-presenter', this.presenter); + break; + case 'set-presenter-visible': + this.presenter.visible = payload; + this.broadcastThis('messages-presenter', this.presenter); + break; + + /*******************************************/ + // Public message + case 'set-public-text': + this.public.text = payload; + this.broadcastThis('messages-public', this.public); + break; + case 'set-public-visible': + this.public.visible = payload; + this.broadcastThis('messages-public', this.public); + break; + + /*******************************************/ + // Lower third message + case 'set-lower-text': + this.lower.text = payload; + this.broadcastThis('messages-lower', this.lower); + break; + case 'set-lower-visible': + this.lower.visible = payload; + this.broadcastThis('messages-lower', this.lower); + break; + + default: + break; + } + } + _listenToConnections() { this.io.on('connection', (socket) => { /*******************************/ @@ -102,6 +162,7 @@ class EventTimer extends Timer { /*** ----------------------------- ***/ /***************************************/ + /*******************************************/ // general playback state socket.on('get-state', () => { socket.emit('timer', this.getObject()); @@ -110,6 +171,7 @@ class EventTimer extends Timer { socket.emit('titles', this.titles); }); + /*******************************************/ // timer socket.on('get-current', () => { socket.emit('current', this.getCurrentInSeconds()); @@ -119,26 +181,17 @@ class EventTimer extends Timer { socket.emit('timer', this.getObject()); }); + /*******************************************/ // playstate socket.on('set-playstate', (data) => { - // check state is defined - if (data === 'start') this.start(); - else if (data === 'pause') this.pause(); - else if (data === 'stop') this.stop(); - else if (data === 'previous') this.previous(); - else if (data === 'next') this.next(); - // Not yet implemented - // else if (data === 'roll') this.roll(); - // else if (data === 'release') this.roll(); - this.broadcastThis('playstate', this.playState); - this.broadcastThis('selected-id', this.selectedEventId); - this.broadcastThis('titles', this.titles); + this._setterManager('set-playstate', data); }); socket.on('get-playstate', () => { socket.emit('playstate', this.playState); }); + /*******************************************/ // titles data socket.on('get-selected-id', () => { socket.emit('selected-id', this.selectedEventId); @@ -154,6 +207,7 @@ class EventTimer extends Timer { /*** ------------------- ***/ /*****************************/ + /*******************************************/ // playback API // ? should i change the address tokeep convention? socket.on('get-messages', () => { @@ -167,45 +221,42 @@ class EventTimer extends Timer { /*** ------------------------- ***/ /***********************************/ + /*******************************************/ // Presenter message socket.on('set-presenter-text', (data) => { - this.presenterText = data; - this.broadcastThis('messages-presenter', this.presenter); + console.log(data); + this._setterManager('set-presenter-text', data); }); socket.on('set-presenter-visible', (data) => { - this.presenterVisible = data; - this.broadcastThis('messages-presenter', this.presenter); + this._setterManager('set-presenter-visible', data); }); socket.on('get-presenter', () => { this.broadcastThis('messages-presenter', this.presenter); }); - + /*******************************************/ // Public message socket.on('set-public-text', (data) => { - this.publicText = data; - this.broadcastThis('messages-public', this.public); + this._setterManager('set-public-text', data); }); socket.on('set-public-visible', (data) => { - this.publicVisible = data; - this.broadcastThis('messages-public', this.public); + this._setterManager('set-public-visible', data); }); socket.on('get-public', () => { socket.emit('messages-public', this.public); }); + /*******************************************/ // Lower third message socket.on('set-lower-text', (data) => { - this.lowerText = data; - this.broadcast('messages-lower', this.lower); + this._setterManager('set-lower-text', data); }); socket.on('set-lower-visible', (data) => { - this.lowerVisible = data; - this.broadcast('messages-lower', this.lower); + this._setterManager('set-lower-visible', data); }); socket.on('get-lower', () => { diff --git a/server/controllers/socketController.js b/server/controllers/socketController.js deleted file mode 100644 index 7a6292d02..000000000 --- a/server/controllers/socketController.js +++ /dev/null @@ -1,150 +0,0 @@ -const socketIo = require('socket.io'); - -const initiateSocket = (server, config) => { - // initialise socketIO server - const io = socketIo(server, { - cors: { - origin: 'http://localhost:3000', - methods: ['GET', 'POST'], - }, - }); - - // set callback for timer events - let interval = setInterval(() => emitTimer(io), config.timer.refresh); - - io.on('connection', (socket) => { - /*******************************/ - /*** HANDLE NEW CONNECTION ***/ - /*** --------------------- ***/ - /*******************************/ - console.log(`New client connected: ${socket.id}`); - - /***************************************/ - /*** TIMER STATE GETTERS / SETTERS ***/ - /*** ----------------------------- ***/ - /***************************************/ - - // general playback state - socket.on('get-state', () => { - socket.emit('timer', global.timer.getObject()); - socket.emit('playstate', global.timer.playState); - socket.emit('selected-id', global.timer.selectedEventId); - socket.emit('titles', global.timer.titles); - }); - - // timer - socket.on('get-current', () => { - socket.emit('current', global.timer.getCurrentInSeconds()); - }); - - socket.on('get-timer', () => { - socket.emit('timer', global.timer.getObject()); - }); - - // playstate - socket.on('set-playstate', (data) => { - // check state is defined - if (data === 'start') global.timer.start(); - else if (data === 'pause') global.timer.pause(); - else if (data === 'stop') global.timer.stop(); - else if (data === 'previous') global.timer.previous(); - else if (data === 'next') global.timer.next(); - // Not yet implemented - // else if (data === 'roll') global.timer.roll(); - // else if (data === 'release') global.timer.roll(); - broadcast(io, 'playstate', global.timer.playState); - broadcast(io, 'selected-id', global.timer.selectedEventId); - broadcast(io, 'titles', global.timer.titles); - }); - - socket.on('get-playstate', () => { - socket.emit('playstate', global.timer.playState); - }); - - // titles data - socket.on('get-selected-id', () => { - socket.emit('selected-id', global.timer.selectedEventId); - }); - - socket.on('get-titles', () => { - socket.emit('titles', global.timer.titles); - }); - - /*****************************/ - /*** BROADCAST ***/ - /*** TIMER STATE GETTERS ***/ - /*** ------------------- ***/ - /*****************************/ - - // playback API - // ? should i change the address tokeep convention? - socket.on('get-messages', () => { - broadcast(io, 'messages-presenter', global.timer.presenter); - broadcast(io, 'messages-public', global.timer.public); - broadcast(io, 'messages-lower', global.timer.lower); - }); - - /***********************************/ - /*** MESSAGE GETTERS / SETTERS ***/ - /*** ------------------------- ***/ - /***********************************/ - - // Presenter message - socket.on('set-presenter-text', (data) => { - global.timer.presenterText = data; - broadcast(io, 'messages-presenter', global.timer.presenter); - }); - - socket.on('set-presenter-visible', (data) => { - global.timer.presenterVisible = data; - broadcast(io, 'messages-presenter', global.timer.presenter); - }); - - socket.on('get-presenter', () => { - socket.emit('messages-presenter', global.timer.presenter); - }); - - // Public message - socket.on('set-public-text', (data) => { - global.timer.publicText = data; - broadcast(io, 'messages-public', global.timer.public); - }); - - socket.on('set-public-visible', (data) => { - global.timer.publicVisible = data; - broadcast(io, 'messages-public', global.timer.public); - }); - - socket.on('get-public', () => { - socket.emit('messages-public', global.timer.public); - }); - - // Lower third message - socket.on('set-lower-text', (data) => { - global.timer.lowerText = data; - broadcast(io, 'messages-lower', global.timer.lower); - }); - - socket.on('set-lower-visible', (data) => { - global.timer.lowerVisible = data; - broadcast(io, 'messages-lower', global.timer.lower); - }); - - socket.on('get-lower', () => { - socket.emit('messages-lower', global.timer.lower); - }); - }); -}; - -// broadcast given payload to given address -const broadcast = (socket, address, payload) => { - socket.emit(address, payload); -}; - -// broadcast: send timer events -const emitTimer = (socket) => { - // send current timer - socket.emit('timer', global.timer.getObject()); -}; - -module.exports = initiateSocket;