cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-16 04:43:35 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

refactor: remove finishedAt from runtime data (#1716)

Browse Source
This commit is contained in:
Alex Christoffer Rasmussen
2025-08-08 20:17:57 +02:00
committed by Carlos Valente
parent 94b1f63c7c
commit 486d89ecf4
8 changed files with 38 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/stores/runtimeState.ts
+9 -7
View File
@@ -48,6 +48,7 @@ export type RuntimeState = {
forceFinish: MaybeNumber; // whether we should declare an event as finished, will contain the finish time
pausedAt: MaybeNumber;
secondaryTarget: MaybeNumber;
hasFinished: boolean;
};
_rundown: {
totalDelay: number; // this value comes from rundown service
@@ -70,6 +71,7 @@ const runtimeState: RuntimeState = {
forceFinish: null,
pausedAt: null,
secondaryTarget: null,
hasFinished: false,
},
_rundown: {
totalDelay: 0,
@@ -115,6 +117,7 @@ export function clearEventData() {
runtimeState._timer.forceFinish = null;
runtimeState._timer.pausedAt = null;
runtimeState._timer.secondaryTarget = null;
runtimeState._timer.hasFinished = false;
}
// clear all necessary data when doing a full stop and the event is unloaded
@@ -144,6 +147,7 @@ export function clearState() {
runtimeState._timer.forceFinish = null;
runtimeState._timer.pausedAt = null;
runtimeState._timer.secondaryTarget = null;
runtimeState._timer.hasFinished = false;
}
/**
@@ -332,7 +336,7 @@ export function updateLoaded(event?: PlayableEvent): string | undefined {
runtimeState.timer.current = runtimeState.timer.duration;
runtimeState.timer.startedAt = null;
runtimeState.timer.finishedAt = null;
runtimeState._timer.hasFinished = false;
runtimeState.timer.addedTime = 0;
runtimeState._timer.pausedAt = null;
@@ -450,15 +454,14 @@ export function addTime(amount: number) {
// handle edge cases
// !!! we need to handle side effects before updating the state
const willGoNegative = amount < 0 && Math.abs(amount) > runtimeState.timer.current;
const hasFinished = runtimeState.timer.finishedAt !== null;
if (willGoNegative && !hasFinished) {
if (willGoNegative && !runtimeState._timer.hasFinished) {
// set finished time so side effects are triggered
runtimeState._timer.forceFinish = timeNow();
} else {
const willGoPositive = runtimeState.timer.current < 0 && runtimeState.timer.current + amount > 0;
if (willGoPositive) {
runtimeState.timer.finishedAt = null;
runtimeState._timer.hasFinished = false;
}
}
@@ -522,11 +525,10 @@ export function update(): UpdateResult {
const finishedNow =
Boolean(runtimeState._timer.forceFinish) ||
(runtimeState.timer.current <= timerConfig.triggerAhead && runtimeState.timer.finishedAt === null);
(runtimeState.timer.current <= timerConfig.triggerAhead && !runtimeState._timer.hasFinished);
if (finishedNow) {
// reset state
runtimeState.timer.finishedAt = runtimeState._timer.forceFinish ?? runtimeState.clock;
runtimeState._timer.hasFinished = true;
} else {
runtimeState.timer.expectedFinish = getExpectedFinish(runtimeState);
}