cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-14 11:53:49 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

cleanup + small refract

Browse Source 
- websockets
- event api
This commit is contained in:
cv
2021-04-11 19:17:54 +02:00
parent dee0ff1a5c
commit 964bdf0d2a
12 changed files with 145 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/app.js
+5 -88
View File
@@ -4,7 +4,6 @@ const config = require('./config.json');
// dependencies
const express = require('express');
const http = require('http');
const socketIo = require('socket.io');
const cors = require('cors');
// Import Routes
@@ -21,6 +20,9 @@ let durationForNow = 5400;
global.timer = new EventTimer();
timer.setupWithSeconds(durationForNow, true);
// Socket
const initiateSocket = require('./controllers/socketController.js');
// Create express APP
const app = express();
@@ -44,93 +46,8 @@ app.use((err, req, res, next) => {
// create HTTP server
const server = http.createServer(app);
// initialise socketIO server
const io = socketIo(server, {
cors: {
origin: 'http://localhost:3000',
methods: ['GET', 'POST'],
},
});
// Torbjorn: should the interval be here or inside the connection?
// I am guessing one interval per timer
// interval function
let interval;
io.on('connection', (socket) => {
console.log('New client connected');
// let interval = null;
// subscribe to timer
socket.on('subscribe-to-timer', () => {
console.log('New subscription');
// avoid multiple intervals
if (interval) clearInterval(interval);
// send current data
socket.emit('timer', timer.getObject());
// set callback for timer events
interval = setInterval(() => emitTimer(socket), config.timer.refresh);
});
// unsubscribe to timer
socket.on('release-timer', () => {
console.log('Releasing subscription');
// avoid multiple intervals
if (interval) clearInterval(interval);
});
socket.on('get-timer', () => {
socket.emit('timer', timer.getObject());
});
socket.on('get-playstate', () => {
socket.emit('playstate', timer.playState);
});
// playback API
socket.on('set-presenter-text', (data) => {
timer.presenterText = data;
socket.emit('messages-presenter', timer.presenter);
});
socket.on('set-presenter-visible', (data) => {
timer.presenterVisible = data;
socket.emit('messages-presenter', timer.presenter);
});
socket.on('get-presenter', () => {
socket.emit('messages-presenter', timer.presenter);
});
socket.on('set-public-text', (data) => {
timer.publicText = data;
socket.emit('messages-public', timer.public);
});
socket.on('set-public-visible', (data) => {
timer.publicVisible = data;
socket.emit('messages-public', timer.public);
});
socket.on('get-public', () => {
socket.emit('messages-public', timer.public);
});
// handle client disconnect
socket.on('disconnect', () => {
console.log('Client disconnected');
if (interval) clearInterval(interval);
});
});
// send timer events
const emitTimer = (socket) => {
// send current timer
socket.emit('timer', timer.getObject());
};
// start socket server
initiateSocket(server, config);
// Start server
server.listen(port, () => console.log(`Listening on port ${port}`));
server/controllers/eventsController.js
+4 -13
View File
@@ -12,12 +12,6 @@ const replaceAt = (array, index, value) => {
return ret;
};
// Create controller for GET request to '/events'
// Returns ACK message
exports.eventsGet = async (req, res) => {
res.send({ response: 'Events Controller API' });
};
// Create controller for GET request to '/events/all'
// Returns -
exports.eventsGetAll = async (req, res) => {
@@ -41,7 +35,7 @@ exports.eventsPost = async (req, res) => {
// ensure structure
let newEvent = {};
req.body.id = nanoid(10);
req.body.id = nanoid(6);
switch (req.body.type) {
case 'event':
@@ -131,17 +125,14 @@ exports.eventsDelete = async (req, res) => {
const itemIndex = events.findIndex((e) => e.id == req.params.id);
// Torbjorn: this syntax is very bad
if (itemIndex === -1) {
res.sendStatus(400);
return;
}
else if (itemIndex === 0) events.shift();
else events.splice(itemIndex, 1);
if (itemIndex === 0) {
const e = events.shift();
} else {
const e = events.splice(itemIndex, 1);
}
// Update events
events = [...events];
res.sendStatus(200);
};
server/controllers/socketController.js
+76
View File
@@ -0,0 +1,76 @@
const socketIo = require('socket.io');
const initiateSocket = (server, config) => {
// initialise socketIO server
const io = socketIo(server, {
cors: {
origin: 'http://localhost:3000',
methods: ['GET', 'POST'],
},
});
let interval = null;
// set callback for timer events
interval = setInterval(() => emitTimer(io), config.timer.refresh);
io.on('connection', (socket) => {
console.log('New client connected');
// send current data
socket.emit('timer', global.timer.getObject());
// unsubscribe to timer
socket.on('release-timer', () => {
console.log('Releasing subscription');
// avoid multiple intervals
if (interval) clearInterval(interval);
});
socket.on('get-timer', () => {
socket.emit('timer', global.timer.getObject());
});
socket.on('get-playstate', () => {
socket.emit('playstate', global.timer.playState);
});
// playback API
socket.on('set-presenter-text', (data) => {
global.timer.presenterText = data;
socket.emit('messages-presenter', global.timer.presenter);
});
socket.on('set-presenter-visible', (data) => {
global.timer.presenterVisible = data;
socket.emit('messages-presenter', global.timer.presenter);
});
socket.on('get-presenter', () => {
socket.emit('messages-presenter', global.timer.presenter);
});
socket.on('set-public-text', (data) => {
global.timer.publicText = data;
socket.emit('messages-public', global.timer.public);
});
socket.on('set-public-visible', (data) => {
global.timer.publicVisible = data;
socket.emit('messages-public', global.timer.public);
});
socket.on('get-public', () => {
socket.emit('messages-public', global.timer.public);
});
});
};
// send timer events
const emitTimer = (socket) => {
// send current timer
socket.emit('timer', global.timer.getObject());
};
module.exports = initiateSocket;
server/routes/eventsRouter.js
+1 -4
View File
@@ -5,10 +5,7 @@ const router = express.Router();
const eventsController = require('../controllers/eventsController');
// create route between controller and '/events' endpoint
router.get('/', eventsController.eventsGet);
// create route between controller and '/events/all' endpoint
router.get('/all', eventsController.eventsGetAll);
router.get('/', eventsController.eventsGetAll);
// create route between controller and '/events/:id' endpoint
router.get('/:id', eventsController.eventsGetById);
server/routes/playbackRouter.js
+3 -6
View File
@@ -4,11 +4,8 @@ const router = express.Router();
// import event controller
const playbackController = require('../controllers/playbackController');
// create route between controller and '/playback' endpoint
router.get('/', playbackController.pbGet);
// create route between controller and '/playback/all' endpoint
router.get('/all', playbackController.pbGetAll);
// create route between controller and '/playback/' endpoint
router.get('/', playbackController.pbGetAll);
// create route between controller and '/playback/start' endpoint
router.get('/start', playbackController.pbStart);
@@ -23,7 +20,7 @@ router.get('/stop', playbackController.pbStop);
router.get('/roll', playbackController.pbRoll);
// create route between controller and '/playback/previous' endpoint
router.get('/previous',playbackController.pbPrevious);
router.get('/previous', playbackController.pbPrevious);
// create route between controller and '/playback/next' endpoint
router.get('/next', playbackController.pbNext);