cjs > esm imports

server/controllers/OscController.js

@@ -1,7 +1,7 @@
-const osc = require('node-osc');
+import { Server } from 'node-osc';
 
-const initiateOSC = (config) => {
-  const oscServer = new osc.Server(config.port, '0.0.0.0', () => {
+export const initiateOSC = (config) => {
+  const oscServer = new Server(config.port, '0.0.0.0', () => {
     console.log(`OSC Server is listening on port ${config.port}`);
   });
 
@@ -83,5 +83,3 @@ const initiateOSC = (config) => {
     }
   });
 };
-
-module.exports = { initiateOSC };

server/controllers/eventController.js

@@ -1,5 +1,5 @@
 // get database
-const { db } = require('../app.js');
+import { db } from '../app.js';
 
 const table = 'event';
 
@@ -9,7 +9,7 @@ function getSettings() {
 
 // Create controller for GET request to 'event'
 // Returns ACK message
-exports.getAll = async (req, res) => {
+export const getAll = async (req, res) => {
   const settings = getSettings();
   if (settings) res.json(settings);
   else res.sendStatus(400);
@@ -17,7 +17,7 @@ exports.getAll = async (req, res) => {
 
 // Create controller for POST request to 'event'
 // Returns ACK message
-exports.post = async (req, res) => {
+export const post = async (req, res) => {
   if (!req.body) {
     res.status(400).send('No object found in request');
     return;
@@ -35,7 +35,7 @@ exports.post = async (req, res) => {
 
 // Create controller for GET request to 'event/title'
 // Returns ACK message
-exports.titleGet = async (req, res) => {
+export const titleGet = async (req, res) => {
   const settings = getSettings();
 
   if (settings) res.json(settings.title);
@@ -44,7 +44,7 @@ exports.titleGet = async (req, res) => {
 
 // Create controller for POST request to 'event/title'
 // Returns ACK message
-exports.titlePost = async (req, res) => {
+export const titlePost = async (req, res) => {
   if (!req.body) {
     res.status(400).send('No object found in request');
     return;
@@ -61,7 +61,7 @@ exports.titlePost = async (req, res) => {
 
 // Create controller for GET request to '/event/url'
 // Returns ACK message
-exports.urlGet = async (req, res) => {
+export const urlGet = async (req, res) => {
   const event = getSettings();
 
   if (event) res.json(event.url);
@@ -70,7 +70,7 @@ exports.urlGet = async (req, res) => {
 
 // Create controller for POST request to '/event/url'
 // Returns ACK message
-exports.urlPost = async (req, res) => {
+export const urlPost = async (req, res) => {
   if (!req.body) {
     res.status(400).send('No object found in request');
     return;
@@ -87,7 +87,7 @@ exports.urlPost = async (req, res) => {
 
 // Create controller for GET request to 'event/publicInfo'
 // Returns ACK message
-exports.publicInfoGet = async (req, res) => {
+export const publicInfoGet = async (req, res) => {
   const settings = getSettings();
 
   if (settings) res.json(settings.publicInfo);
@@ -96,7 +96,7 @@ exports.publicInfoGet = async (req, res) => {
 
 // Create controller for POST request to '/event/publicInfo'
 // Returns ACK message
-exports.publicInfoPost = async (req, res) => {
+export const publicInfoPost = async (req, res) => {
   if (!req.body) {
     res.status(400).send('No object found in request');
     return;
@@ -113,7 +113,7 @@ exports.publicInfoPost = async (req, res) => {
 
 // Create controller for GET request to 'event/backstageInfo'
 // Returns ACK message
-exports.backstageInfoGet = async (req, res) => {
+export const backstageInfoGet = async (req, res) => {
   const settings = getSettings();
 
   if (settings) res.json(settings.backstageInfo);
@@ -122,7 +122,7 @@ exports.backstageInfoGet = async (req, res) => {
 
 // Create controller for POST request to '/event/info'
 // Returns ACK message
-exports.backstageInfoPost = async (req, res) => {
+export const backstageInfoPost = async (req, res) => {
   if (!req.body) {
     res.status(400).send('No object found in request');
     return;
@@ -139,6 +139,6 @@ exports.backstageInfoPost = async (req, res) => {
 
 // Create controller for GET request to 'event/osc'
 // Returns ACK message
-exports.osc = async (req, res) => {
+export const osc = async (req, res) => {
   res.send('Not yet implemented').status(500);
 };

server/controllers/eventsController.js

@@ -1,10 +1,14 @@
 // get database
-const db = require('../app.js').db;
+import { db } from '../app.js';
 
 // utils
-const customAlphabet = require('nanoid').customAlphabet;
+import { customAlphabet } from 'nanoid';
 const nanoid = customAlphabet('1234567890abcdef', 4);
-const eventDefs = require('../data/eventsDefinition.js');
+import {
+  event as eventDef,
+  block as blockDef,
+  delay as delayDEf,
+} from '../data/eventsDefinition.js';
 
 function _getEventsCount() {
   return db.get('events').size().value();
@@ -68,21 +72,21 @@ function _deleteTimerId(entryId) {
 
 // Create controller for GET request to '/events'
 // Returns -
-exports.eventsGetAll = async (req, res) => {
+export const eventsGetAll = async (req, res) => {
   const results = db.get('events').value();
   res.json(results);
 };
 
 // Create controller for GET request to '/events/:eventId'
 // Returns -
-exports.eventsGetById = async (req, res) => {
+export const eventsGetById = async (req, res) => {
   const e = db.get('events').find({ id: req.params.eventId }).value();
   res.json(e);
 };
 
 // Create controller for POST request to '/events/'
 // Returns -
-exports.eventsPost = async (req, res) => {
+export const eventsPost = async (req, res) => {
   // TODO: Validate event
   if (!req.body) {
     res.status(400).send(`No object found in request`);
@@ -131,7 +135,7 @@ exports.eventsPost = async (req, res) => {
 
 // Create controller for PUT request to '/events/'
 // Returns -
-exports.eventsPut = async (req, res) => {
+export const eventsPut = async (req, res) => {
   // no valid params
   if (!req.body) {
     res.status(400).send(`No object found`);
@@ -162,12 +166,12 @@ exports.eventsPut = async (req, res) => {
 
 // Create controller for PATCH request to '/events/'
 // Returns -
-exports.eventsPatch = async (req, res) => {
+export const eventsPatch = async (req, res) => {
   // Code is the same as put, call that
   this.eventsPut(req, res);
 };
 
-exports.eventsReorder = async (req, res) => {
+export const eventsReorder = async (req, res) => {
   // TODO: Validate event
   if (!req.body) {
     res.status(400).send(`No object found in request`);
@@ -209,7 +213,7 @@ exports.eventsReorder = async (req, res) => {
 
 // Create controller for PATCH request to '/events/applydelay/:eventId'
 // Returns -
-exports.eventsApplyDelay = async (req, res) => {
+export const eventsApplyDelay = async (req, res) => {
   // no valid params
   if (!req.params.eventId) {
     res.status(400).send(`No id found in request`);
@@ -274,7 +278,7 @@ exports.eventsApplyDelay = async (req, res) => {
 
 // Create controller for DELETE request to '/events/:eventId'
 // Returns -
-exports.eventsDelete = async (req, res) => {
+export const eventsDelete = async (req, res) => {
   // no valid params
   if (!req.params.eventId) {
     res.status(400).send(`No id found in request`);
@@ -298,7 +302,7 @@ exports.eventsDelete = async (req, res) => {
 
 // Create controller for DELETE request to '/events/:eventId'
 // Returns -
-exports.eventsDeleteAll = async (req, res) => {
+export const eventsDeleteAll = async (req, res) => {
   try {
     // set with nothing
     db.set('events', []).write();