V2 fix socket (#296)

* refactor: rename timer endpoint

* refactor: typescript

* refactor: rename eventData and viewSettings

* refactor: message manager uses event store
This commit is contained in:
Carlos Valente
2023-02-24 22:47:07 +01:00
committed by GitHub
parent 03552056cb
commit edac1d7f75
102 changed files with 836 additions and 715 deletions
+2 -5
View File
@@ -4,7 +4,6 @@ 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';
import { ADDRESS_MESSAGE_CONTROL } from '../classes/socket/socketConfig.js';
let oscServer = null;
@@ -47,13 +46,11 @@ export const initiateOSC = (config: OSCSettings) => {
switch (path.toLowerCase()) {
case 'onair': {
const featureData = messageManager.setOnAir(true);
socketProvider.send(ADDRESS_MESSAGE_CONTROL, featureData);
messageManager.setOnAir(true);
break;
}
case 'offair': {
const featureData = messageManager.setOnAir(false);
socketProvider.send(ADDRESS_MESSAGE_CONTROL, featureData);
messageManager.setOnAir(false);
break;
}
case 'play': {
@@ -2,18 +2,18 @@ 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.ts';
import { DataProvider } from '../classes/data-provider/DataProvider.js';
import { failEmptyObjects, failIsNotArray } from '../utils/routerUtils.js';
import { mergeObject } from '../utils/parserUtils.js';
import { PlaybackService } from '../services/PlaybackService.js';
import { runtimeState } from '../stores/EventStore.js';
import { eventStore } from '../stores/EventStore.js';
import { resolveDbPath } from '../setup.js';
// Create controller for GET request to '/ontime/poll'
// Returns data for current state
export const poll = async (req, res) => {
try {
const s = runtimeState.poll();
const s = eventStore.poll();
res.status(200).send(s);
} catch (error) {
res.status(500).send({
@@ -225,7 +225,7 @@ export const postSettings = async (req, res) => {
* @method GET
*/
export const getViewSettings = async (req, res) => {
const views = DataProvider.getViews();
const views = DataProvider.getViewSettings();
res.status(200).send(views);
};
@@ -240,7 +240,7 @@ export const postViewSettings = async (req, res) => {
try {
const newData = { overrideStyles: req.body.overrideStyles };
await DataProvider.setViews(newData);
await DataProvider.setViewSettings(newData);
res.status(200).send(newData);
} catch (error) {
res.status(400).send(error);
@@ -7,7 +7,7 @@ import {
deleteEvent,
editEvent,
reorderEvent,
} from '../services/RundownService.js';
} from '../services/RundownService.ts';
// Create controller for GET request to '/eventlist'
// Returns -