V2 integration (#293)

* feat: integrations and lifecycles

* refactor: prevent issues with start order

apps/server/src/controllers/OscController.ts

@@ -1,4 +1,6 @@
 import { Server } from 'node-osc';
+import { OSCSettings } from 'ontime-types';
+
 import { PlaybackService } from '../services/PlaybackService.js';
 import { messageManager } from '../classes/message-manager/MessageManager.js';
 import { socketProvider } from '../classes/socket/SocketController.js';
@@ -14,11 +16,10 @@ export const shutdownOSCServer = () => {
 };
 
 /**
- * @description initialises OSC server
- * @param {object} config
+ * Initialises OSC server
  */
-export const initiateOSC = (config) => {
-  oscServer = new Server(config.port, '0.0.0.0');
+export const initiateOSC = (config: OSCSettings) => {
+  oscServer = new Server(config.portIn, '0.0.0.0');
 
   oscServer.on('error', console.error);
 
@@ -34,7 +35,7 @@ export const initiateOSC = (config) => {
 
     // get first part before (ontime)
     if (address !== 'ontime') {
-      console.error('RX', `OSC IN: Message address ${address} not recognised`);
+      console.error('RX', `OSC IN: Message address ${address} not recognised`, msg);
       return;
     }
 
@@ -123,10 +124,7 @@ export const initiateOSC = (config) => {
         try {
           const eventIndex = Number(args);
           if (isNaN(eventIndex) || eventIndex <= 0) {
-            socketProvider.error(
-              'RX',
-              `OSC IN: event index not recognised or out of range ${eventIndex}`
-            );
+            socketProvider.error('RX', `OSC IN: event index not recognised or out of range ${eventIndex}`);
           } else {
             PlaybackService.loadByIndex(eventIndex - 1);
           }

apps/server/src/controllers/eventController.js

@@ -1,6 +1,6 @@
 import { removeUndefined } from '../utils/parserUtils.js';
 import { failEmptyObjects } from '../utils/routerUtils.js';
-import { DataProvider } from '../classes/data-provider/DataProvider.js';
+import { DataProvider } from '../classes/data-provider/DataProvider.ts';
 
 // Create controller for GET request to 'event'
 export const getEvent = async (req, res) => {

apps/server/src/controllers/ontimeController.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import { networkInterfaces } from 'os';
 import { generateId } from 'ontime-utils';
 import { fileHandler } from '../utils/parser.js';
-import { DataProvider } from '../classes/data-provider/DataProvider.js';
+import { DataProvider } from '../classes/data-provider/DataProvider.ts';
 import { failEmptyObjects, failIsNotArray } from '../utils/routerUtils.js';
 import { mergeObject } from '../utils/parserUtils.js';
 import { PlaybackService } from '../services/PlaybackService.js';

apps/server/src/controllers/ontimeController.validate.js

@@ -65,10 +65,11 @@ export const validateSettings = [
  * @description Validates object for POST /ontime/osc
  */
 export const validateOSC = [
-  body('port').exists().isInt({ min: 0, max: 65353 }),
-  body('portOut').exists().isInt({ min: 0, max: 65353 }),
+  body('portIn').exists().isInt({ min: 1024, max: 65535 }),
+  body('portOut').exists().isInt({ min: 1024, max: 65535 }),
   body('targetIP').exists().isIP(),
-  body('enabled').exists().isBoolean(),
+  body('enabledIn').exists().isBoolean(),
+  body('enabledOut').exists().isBoolean(),
   (req, res, next) => {
     const errors = validationResult(req);
     if (!errors.isEmpty()) return res.status(422).json({ errors: errors.array() });

apps/server/src/controllers/rundownController.js

@@ -1,4 +1,4 @@
-import { DataProvider } from '../classes/data-provider/DataProvider.js';
+import { DataProvider } from '../classes/data-provider/DataProvider.ts';
 import { failEmptyObjects } from '../utils/routerUtils.js';
 import {
   addEvent,