cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-13 11:23:50 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

refactor: consolidate language of AuxTimer (#896)

Browse Source
This commit is contained in:
Carlos Valente
2024-04-17 21:31:10 +02:00
committed by GitHub
parent 16a169b22c
commit cf14b0b427
9 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/api-integration/integration.controller.ts
+6 -6
View File
@@ -1,7 +1,7 @@
import { DeepPartial, MessageState, OntimeEvent, SimpleDirection, SimplePlayback } from 'ontime-types';
import { ONTIME_VERSION } from '../ONTIME_VERSION.js';
import { extraTimerService } from '../services/extra-timer-service/ExtraTimerService.js';
import { auxTimerService } from '../services/aux-timer-service/AuxTimerService.js';
import { messageService } from '../services/message-service/MessageService.js';
import { validateMessage, validateTimerMessage } from '../services/message-service/messageUtils.js';
import { runtimeService } from '../services/runtime-service/RuntimeService.js';
@@ -190,26 +190,26 @@ const actionHandlers: Record<string, ActionHandler> = {
const command = payload['1'];
if (typeof command === 'string') {
if (command === SimplePlayback.Start) {
const reply = extraTimerService.start();
const reply = auxTimerService.start();
return { payload: reply };
}
if (command === SimplePlayback.Pause) {
const reply = extraTimerService.pause();
const reply = auxTimerService.pause();
return { payload: reply };
}
if (command === SimplePlayback.Stop) {
const reply = extraTimerService.stop();
const reply = auxTimerService.stop();
return { payload: reply };
}
} else if (command && typeof command === 'object') {
const reply = { payload: {} };
if ('duration' in command) {
const time = numberOrError(command.duration);
reply.payload = extraTimerService.setTime(time * 1000); //frontend is seconds based
reply.payload = auxTimerService.setTime(time * 1000); //frontend is seconds based
}
if ('direction' in command) {
if (command.direction === SimpleDirection.CountUp || command.direction === SimpleDirection.CountDown) {
reply.payload = extraTimerService.setDirection(command.direction);
reply.payload = auxTimerService.setDirection(command.direction);
} else {
throw new Error('Invalid direction payload');
}
apps/server/src/services/extra-timer-service/ExtraTimerService.ts → apps/server/src/services/aux-timer-service/AuxTimerService.ts
+2 -2
View File
@@ -6,7 +6,7 @@ import { eventStore } from '../../stores/EventStore.js';
export type EmitFn = (state: SimpleTimerState) => void;
export type GetTimeFn = () => number;
export class ExtraTimerService {
export class AuxTimerService {
private timer: SimpleTimer;
private interval: NodeJS.Timer | null = null;
private emit: EmitFn;
@@ -76,4 +76,4 @@ function broadcastReturn(_target: any, _propertyKey: string, descriptor: Propert
const emit = (state: SimpleTimerState) => eventStore.set('auxtimer1', state);
const timeNow = () => Date.now();
export const extraTimerService = new ExtraTimerService(emit, timeNow);
export const auxTimerService = new AuxTimerService(emit, timeNow);