Active Pieces:
diff --git a/packages/live-status-gateway/sample-client/script.js b/packages/live-status-gateway/sample-client/script.js
index a31abd9471..06c96ac2d9 100644
--- a/packages/live-status-gateway/sample-client/script.js
+++ b/packages/live-status-gateway/sample-client/script.js
@@ -70,6 +70,7 @@ const TIME_OF_DAY_SPAN_ID = 'time-of-day'
const SEGMENT_DURATION_SPAN_CLASS = 'segment-duration'
const SEGMENT_REMAINIG_SPAN_ID = 'segment-remaining'
const PART_REMAINIG_SPAN_ID = 'part-remaining'
+const T_TIMERS_DIV_ID = 't-timers'
const ACTIVE_PIECES_SPAN_ID = 'active-pieces'
const NEXT_PIECES_SPAN_ID = 'next-pieces'
const SEGMENTS_DIV_ID = 'segments'
@@ -86,6 +87,8 @@ function handleActivePlaylist(data) {
'
- ' +
activePlaylist.nextPart.pieces.map((p) => `${p.name} [${p.tags || []}]`).join('
- ') +
'
'
+
+ handleTTimers(data.tTimers)
}
let activePieces = {}
function handleActivePieces(data) {
@@ -124,6 +127,7 @@ setInterval(() => {
if (partEndTime) partRemainingEl.textContent = formatMillisecondsToTime(Math.ceil(partEndTime / 1000) * 1000 - now)
updateClock()
+ updateTTimers(activePlaylist.tTimers)
}, 100)
function updateClock() {
@@ -182,3 +186,119 @@ function formatMillisecondsToTime(milliseconds) {
return `${isNegative ? '+' : ''}${formattedHours}:${formattedMinutes}:${formattedSeconds}`
}
+
+function formatTimestampToTimeOfDay(timestamp) {
+ const date = new Date(timestamp)
+ const hours = String(date.getHours()).padStart(2, '0')
+ const minutes = String(date.getMinutes()).padStart(2, '0')
+ const seconds = String(date.getSeconds()).padStart(2, '0')
+ return `${hours}:${minutes}:${seconds}`
+}
+
+function handleTTimers(tTimers) {
+ const tTimersDiv = document.getElementById(T_TIMERS_DIV_ID)
+ if (!tTimersDiv || !tTimers) return
+
+ const ul = document.createElement('ul')
+
+ tTimers.forEach((timer) => {
+ const li = document.createElement('li')
+ li.id = `t-timer-${timer.index}`
+ li.textContent = `Timer ${timer.index}:`
+
+ const detailUl = document.createElement('ul')
+
+ if (timer.configured) {
+ // Type
+ const typeLi = document.createElement('li')
+ typeLi.textContent = `Type: "${timer.mode.type}"`
+ detailUl.appendChild(typeLi)
+
+ // Label
+ const labelLi = document.createElement('li')
+ labelLi.textContent = `Label: ${timer.label ? JSON.stringify(timer.label) : '(no label)'}`
+ detailUl.appendChild(labelLi)
+
+ // Value
+ const valueLi = document.createElement('li')
+ valueLi.appendChild(document.createTextNode('Value: '))
+ const valueSpan = document.createElement('span')
+ valueSpan.id = `t-timer-value-${timer.index}`
+ valueLi.appendChild(valueSpan)
+ detailUl.appendChild(valueLi)
+
+ // Projected (if available)
+ if (timer.projected && timer.anchorPartId) {
+ const projectedLi = document.createElement('li')
+ projectedLi.id = `t-timer-projected-${timer.index}`
+ detailUl.appendChild(projectedLi)
+ }
+ } else {
+ // Show "Not set" for unconfigured timers
+ const notSetLi = document.createElement('li')
+ notSetLi.textContent = 'Not set'
+ detailUl.appendChild(notSetLi)
+ }
+
+ li.appendChild(detailUl)
+ ul.appendChild(li)
+ })
+
+ tTimersDiv.innerHTML = ''
+ tTimersDiv.appendChild(ul)
+}
+
+function updateTTimers(tTimers) {
+ if (!tTimers) return
+
+ const now = ENABLE_SYNCED_TICKS ? Math.floor(Date.now() / 1000) * 1000 : Date.now()
+
+ tTimers.forEach((timer) => {
+ if (!timer.configured) return
+
+ const valueSpan = document.getElementById(`t-timer-value-${timer.index}`)
+ if (!valueSpan) return
+
+ // Calculate current timer value
+ let currentTime
+ if (timer.state.paused) {
+ currentTime = timer.state.duration
+ valueSpan.textContent = formatMillisecondsToTime(currentTime) + ' (paused)'
+ } else if (timer.state.pauseTime && now >= timer.state.pauseTime) {
+ // Timer has reached its pauseTime - freeze at that moment
+ currentTime = timer.state.zeroTime - timer.state.pauseTime
+ valueSpan.textContent =
+ formatMillisecondsToTime(currentTime) +
+ ` (pauseTime: ${formatTimestampToTimeOfDay(timer.state.pauseTime)})`
+ } else {
+ currentTime = timer.state.zeroTime - now
+ valueSpan.textContent =
+ formatMillisecondsToTime(currentTime) +
+ ` (zeroTime: ${formatTimestampToTimeOfDay(timer.state.zeroTime)})`
+ }
+
+ // Update projected time if available
+ const projectedLi = document.getElementById(`t-timer-projected-${timer.index}`)
+ if (projectedLi && timer.projected) {
+ let projectedTime
+ let projectedInfo = ''
+ if (timer.projected.paused) {
+ projectedTime = timer.projected.duration
+ projectedInfo = ' (paused)'
+ } else if (timer.projected.pauseTime && now >= timer.projected.pauseTime) {
+ // Projected timer has reached its pauseTime - freeze at that moment
+ projectedTime = timer.projected.zeroTime - timer.projected.pauseTime
+ projectedInfo = ` (pauseTime: ${formatTimestampToTimeOfDay(timer.projected.pauseTime)})`
+ } else {
+ projectedTime = timer.projected.zeroTime - now
+ projectedInfo = ` (zeroTime: ${formatTimestampToTimeOfDay(timer.projected.zeroTime)})`
+ }
+
+ const diff = currentTime - projectedTime
+ const diffStr = formatMillisecondsToTime(Math.abs(diff))
+ const status = diff > 0 ? 'under' : 'over'
+
+ projectedLi.textContent = `Projected: ${formatMillisecondsToTime(projectedTime)}${projectedInfo} (${diffStr} ${status})`
+ }
+ })
+}
diff --git a/packages/live-status-gateway/src/topics/__tests__/activePlaylist.spec.ts b/packages/live-status-gateway/src/topics/__tests__/activePlaylist.spec.ts
index 702ee867c6..b14b46c1e9 100644
--- a/packages/live-status-gateway/src/topics/__tests__/activePlaylist.spec.ts
+++ b/packages/live-status-gateway/src/topics/__tests__/activePlaylist.spec.ts
@@ -63,6 +63,35 @@ describe('ActivePlaylistTopic', () => {
timingMode: ActivePlaylistTimingMode.NONE,
},
quickLoop: undefined,
+ tTimers: [
+ {
+ index: 1,
+ label: '',
+ configured: false,
+ mode: null,
+ state: null,
+ projected: null,
+ anchorPartId: null,
+ },
+ {
+ index: 2,
+ label: '',
+ configured: false,
+ mode: null,
+ state: null,
+ projected: null,
+ anchorPartId: null,
+ },
+ {
+ index: 3,
+ label: '',
+ configured: false,
+ mode: null,
+ state: null,
+ projected: null,
+ anchorPartId: null,
+ },
+ ],
}
// eslint-disable-next-line @typescript-eslint/unbound-method
@@ -164,6 +193,35 @@ describe('ActivePlaylistTopic', () => {
timingMode: ActivePlaylistTimingMode.NONE,
},
quickLoop: undefined,
+ tTimers: [
+ {
+ index: 1,
+ label: '',
+ configured: false,
+ mode: null,
+ state: null,
+ projected: null,
+ anchorPartId: null,
+ },
+ {
+ index: 2,
+ label: '',
+ configured: false,
+ mode: null,
+ state: null,
+ projected: null,
+ anchorPartId: null,
+ },
+ {
+ index: 3,
+ label: '',
+ configured: false,
+ mode: null,
+ state: null,
+ projected: null,
+ anchorPartId: null,
+ },
+ ],
}
// eslint-disable-next-line @typescript-eslint/unbound-method
@@ -270,6 +328,35 @@ describe('ActivePlaylistTopic', () => {
timingMode: ActivePlaylistTimingMode.NONE,
},
quickLoop: undefined,
+ tTimers: [
+ {
+ index: 1,
+ label: '',
+ configured: false,
+ mode: null,
+ state: null,
+ projected: null,
+ anchorPartId: null,
+ },
+ {
+ index: 2,
+ label: '',
+ configured: false,
+ mode: null,
+ state: null,
+ projected: null,
+ anchorPartId: null,
+ },
+ {
+ index: 3,
+ label: '',
+ configured: false,
+ mode: null,
+ state: null,
+ projected: null,
+ anchorPartId: null,
+ },
+ ],
}
// eslint-disable-next-line @typescript-eslint/unbound-method
diff --git a/packages/live-status-gateway/src/topics/activePlaylistTopic.ts b/packages/live-status-gateway/src/topics/activePlaylistTopic.ts
index aa4b009329..9cabd80500 100644
--- a/packages/live-status-gateway/src/topics/activePlaylistTopic.ts
+++ b/packages/live-status-gateway/src/topics/activePlaylistTopic.ts
@@ -5,6 +5,7 @@ import {
DBRundownPlaylist,
QuickLoopMarker,
QuickLoopMarkerType,
+ RundownTTimer,
} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
import { assertNever, literal } from '@sofie-automation/shared-lib/dist/lib/lib'
@@ -30,12 +31,23 @@ import {
ActivePlaylistQuickLoop,
QuickLoopMarker as QuickLoopMarkerStatus,
QuickLoopMarkerType as QuickLoopMarkerStatusType,
+ TTimerStatus,
+ TTimerIndex,
+ TimerModeCountdown,
+ TimerModeFreeRun,
+ TimerModeTimeOfDay,
+ TimerStateRunning,
+ TimerStatePaused,
} from '@sofie-automation/live-status-gateway-api'
import { CollectionHandlers } from '../liveStatusServer.js'
import areElementsShallowEqual from '@sofie-automation/shared-lib/dist/lib/isShallowEqual'
import { Complete, PickKeys } from '@sofie-automation/shared-lib/dist/lib/types'
+// Union types for timer modes and states (not exported from API package)
+type TimerMode = TimerModeCountdown | TimerModeFreeRun | TimerModeTimeOfDay
+type TimerState = TimerStateRunning | TimerStatePaused
+
const THROTTLE_PERIOD_MS = 100
const PLAYLIST_KEYS = [
@@ -51,6 +63,7 @@ const PLAYLIST_KEYS = [
'timing',
'startedPlayback',
'quickLoop',
+ 'tTimers',
] as const
type Playlist = PickKeys
@@ -168,10 +181,12 @@ export class ActivePlaylistTopic extends WebSocketTopicBase implements WebSocket
? this._activePlaylist.timing.expectedStart
: undefined,
expectedEnd:
- this._activePlaylist.timing.type !== PlaylistTimingType.None
+ this._activePlaylist.timing.type !== PlaylistTimingType.None &&
+ this._activePlaylist.timing.type !== PlaylistTimingType.Duration
? this._activePlaylist.timing.expectedEnd
: undefined,
},
+ tTimers: this.transformTTimers(this._activePlaylist.tTimers),
})
: literal>({
event: 'activePlaylist',
@@ -188,6 +203,7 @@ export class ActivePlaylistTopic extends WebSocketTopicBase implements WebSocket
timing: {
timingMode: ActivePlaylistTimingMode.NONE,
},
+ tTimers: this.transformTTimers(null),
})
this.sendMessage(subscribers, message)
@@ -251,6 +267,81 @@ export class ActivePlaylistTopic extends WebSocketTopicBase implements WebSocket
}
}
+ private transformTTimers(tTimers: RundownTTimer[] | null | undefined): [TTimerStatus, TTimerStatus, TTimerStatus] {
+ // Always return exactly 3 timers
+ if (!tTimers || tTimers.length === 0) {
+ return [
+ {
+ index: 1 as TTimerIndex,
+ label: '',
+ configured: false,
+ mode: null,
+ state: null,
+ projected: null,
+ anchorPartId: null,
+ },
+ {
+ index: 2 as TTimerIndex,
+ label: '',
+ configured: false,
+ mode: null,
+ state: null,
+ projected: null,
+ anchorPartId: null,
+ },
+ {
+ index: 3 as TTimerIndex,
+ label: '',
+ configured: false,
+ mode: null,
+ state: null,
+ projected: null,
+ anchorPartId: null,
+ },
+ ]
+ }
+
+ return [this.transformTTimer(tTimers[0]), this.transformTTimer(tTimers[1]), this.transformTTimer(tTimers[2])]
+ }
+
+ private transformTTimer(timer: RundownTTimer): TTimerStatus {
+ const index = timer.index as TTimerIndex
+
+ if (!timer.mode || !timer.state) {
+ return {
+ index,
+ label: timer.label,
+ configured: false,
+ mode: null,
+ state: null,
+ projected: null,
+ anchorPartId: null,
+ }
+ }
+
+ // Transform mode - directly pass through
+ const mode: TimerMode = timer.mode as TimerMode
+
+ // Transform state - directly pass through
+ const state: TimerState = timer.state as TimerState
+
+ // Transform projected state - directly pass through
+ const projected: TimerState | null = timer.projectedState ? (timer.projectedState as TimerState) : null
+
+ // Transform anchorPartId
+ const anchorPartId = timer.anchorPartId ? unprotectString(timer.anchorPartId) : null
+
+ return {
+ index,
+ label: timer.label,
+ configured: true,
+ mode,
+ state,
+ projected,
+ anchorPartId,
+ }
+ }
+
private isDataInconsistent() {
return (
this._currentPartInstance?._id !== this._activePlaylist?.currentPartInfo?.partInstanceId ||
@@ -338,6 +429,8 @@ function translatePlaylistTimingType(type: PlaylistTimingType): ActivePlaylistTi
return ActivePlaylistTimingMode.BACK_MINUS_TIME
case PlaylistTimingType.ForwardTime:
return ActivePlaylistTimingMode.FORWARD_MINUS_TIME
+ case PlaylistTimingType.Duration:
+ return ActivePlaylistTimingMode.DURATION
default:
assertNever(type)
// Cast and return the value anyway, so that the application works
diff --git a/packages/webui/src/client/lib/rundownTiming.ts b/packages/webui/src/client/lib/rundownTiming.ts
index a273b072ed..d9368a4ab7 100644
--- a/packages/webui/src/client/lib/rundownTiming.ts
+++ b/packages/webui/src/client/lib/rundownTiming.ts
@@ -846,6 +846,13 @@ export function getPlaylistTimingDiff(
frontAnchor = Math.max(currentTime, playlist.startedPlayback ?? Math.max(timing.expectedStart, currentTime))
} else if (PlaylistTiming.isPlaylistTimingBackTime(timing)) {
backAnchor = timingContext.nextRundownAnchor ?? timing.expectedEnd
+ } else if (PlaylistTiming.isPlaylistDurationTimed(timing)) {
+ const backAnchorTimeWithoutBreaks =
+ timingContext.nextRundownAnchor ??
+ PlaylistTiming.getExpectedEnd(timing, playlist.startedPlayback) ??
+ currentTime + timing.expectedDuration
+ backAnchor = timingContext.nextRundownAnchor ?? backAnchorTimeWithoutBreaks
+ frontAnchor = Math.max(currentTime, playlist.startedPlayback || PlaylistTiming.getExpectedStart(timing) || 0)
}
let diff = PlaylistTiming.isPlaylistTimingNone(timing)
diff --git a/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderExpectedEnd.tsx b/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderExpectedEnd.tsx
index b895e1e13e..10416f08ab 100644
--- a/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderExpectedEnd.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderExpectedEnd.tsx
@@ -14,17 +14,16 @@ export function RundownHeaderExpectedEnd({
const { t } = useTranslation()
const timingDurations = useTiming()
- const expectedStart = PlaylistTiming.getExpectedStart(playlist.timing)
- const expectedEnd = PlaylistTiming.getExpectedEnd(playlist.timing)
const now = timingDurations.currentTime ?? Date.now()
+ const expectedEnd = PlaylistTiming.getExpectedEnd(playlist.timing, playlist.startedPlayback)
+ const estEnd = PlaylistTiming.getEstimatedEnd(
+ playlist.timing,
+ now,
+ timingDurations.remainingPlaylistDuration,
+ playlist.startedPlayback
+ )
- // Use remainingPlaylistDuration which includes current part's remaining time
- const estEnd =
- timingDurations.remainingPlaylistDuration !== undefined
- ? Math.max(now, expectedStart ?? now) + timingDurations.remainingPlaylistDuration
- : null
-
- if (expectedEnd === undefined && estEnd === null) return null
+ if (expectedEnd === undefined && estEnd === undefined) return null
return (