From 5cf5b2fae3810f156d4bc2aed1db1c0782b0f38b Mon Sep 17 00:00:00 2001 From: Carlos Valente Date: Sun, 21 Apr 2024 23:11:58 +0200 Subject: [PATCH] chore: cleanup --- apps/server/src/adapters/WebsocketAdapter.ts | 2 +- .../src/api-integration/integration.controller.ts | 3 +-- .../src/api-integration/integration.router.ts | 13 +------------ .../server/src/api-integration/integration.utils.ts | 2 +- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/apps/server/src/adapters/WebsocketAdapter.ts b/apps/server/src/adapters/WebsocketAdapter.ts index abb7bafe0..7a3c7e62e 100644 --- a/apps/server/src/adapters/WebsocketAdapter.ts +++ b/apps/server/src/adapters/WebsocketAdapter.ts @@ -120,7 +120,7 @@ export class SocketServer implements IAdapter { if (reply) { ws.send( JSON.stringify({ - type: 'ontime-change', + type, payload: reply.payload, }), ); diff --git a/apps/server/src/api-integration/integration.controller.ts b/apps/server/src/api-integration/integration.controller.ts index 2190e1d48..7ecaac87e 100644 --- a/apps/server/src/api-integration/integration.controller.ts +++ b/apps/server/src/api-integration/integration.controller.ts @@ -56,7 +56,6 @@ const actionHandlers: Record = { }); updateEvent(patchEvent); - Object.assign(patchEvent); return { payload: 'success' }; }, @@ -75,7 +74,7 @@ const actionHandlers: Record = { /* Playback */ start: (payload) => { if (payload === undefined) { - return successPayloadOrError(runtimeService.start(), 'Uable to start'); + return successPayloadOrError(runtimeService.start(), 'Unable to start'); } if (payload && typeof payload === 'object') { diff --git a/apps/server/src/api-integration/integration.router.ts b/apps/server/src/api-integration/integration.router.ts index 243b682f8..c652d49a2 100644 --- a/apps/server/src/api-integration/integration.router.ts +++ b/apps/server/src/api-integration/integration.router.ts @@ -5,7 +5,7 @@ * */ -import { ErrorResponse, LogOrigin, RuntimeStore } from 'ontime-types'; +import { LogOrigin } from 'ontime-types'; import express, { type Request, type Response } from 'express'; @@ -14,7 +14,6 @@ import { integrationPayloadFromPath } from '../adapters/utils/parse.js'; import { dispatchFromAdapter } from './integration.controller.js'; import { getErrorMessage } from 'ontime-utils'; -import { eventStore } from '../stores/EventStore.js'; import { isEmptyObject } from '../utils/parserUtils.js'; export const integrationRouter = express.Router(); @@ -52,13 +51,3 @@ integrationRouter.get('/*', (req: Request, res: Response) => { res.status(500).send({ message: errorMessage }); } }); - -integrationRouter.get('/poll', (_req: Request, res: Response | ErrorResponse>) => { - try { - const state = eventStore.poll(); - res.status(200).send(state); - } catch (error) { - const message = getErrorMessage(error); - res.status(500).send({ message: `Could not get sync data: ${message}` }); - } -}); diff --git a/apps/server/src/api-integration/integration.utils.ts b/apps/server/src/api-integration/integration.utils.ts index f5bf3a38b..548b0a834 100644 --- a/apps/server/src/api-integration/integration.utils.ts +++ b/apps/server/src/api-integration/integration.utils.ts @@ -10,7 +10,7 @@ const whitelistedPayload = { note: coerceString, cue: coerceString, - duration: (value: unknown) => coerceNumber(value) * 1000, //frontend is seconds based + duration: (value: unknown) => coerceNumber(value) * 1000, isPublic: coerceBoolean, skip: coerceBoolean,