cleanup + small refract

- websockets
- event api

server/controllers/eventsController.js

@@ -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

@@ -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;