Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: refactor vizmse device to state handler SOFIE-2498 #347

Draft
wants to merge 6 commits into
base: release52
Choose a base branch
from
+1,671 −1,703
Draft

chore: refactor vizmse device to state handler SOFIE-2498 #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
53dde09
wip: refactor
Julusian Aug 23, 2024
d11e777
wip: bulk of refactor
Julusian Aug 23, 2024
6379bda
wip: reimplement queue
Julusian Aug 30, 2024
ae4c5c6
wip
Julusian Sep 9, 2024
fa22165
wip: propogate handleExpectedPlayoutItems
Julusian Sep 9, 2024
e161966
wip: couple of tests
Julusian Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/timeline-state-resolver/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = {
'ts-jest',
{
tsconfig: 'tsconfig.json',
diagnostics: { ignoreCodes: [6133, 6192] },
diagnostics: { ignoreCodes: [6133, 6192, 6196] },
},
],
},
Expand Down
7 changes: 6 additions & 1 deletion packages/timeline-state-resolver/src/__mocks__/v-connection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,15 @@ export const createMSE: typeof orgCreateMSE = function createMSE0(
return mse
}

export function getMockMSEs() {
export function getMockMSEs(): MSEMock[] {
return mockMSEs
}

export function getLastMockMSE(): MSEMock {
if (mockMSEs.length === 0) throw new Error('No MSE found')
return mockMSEs[mockMSEs.length - 1]
}

export class MSEMock extends EventEmitter implements MSE {
public readonly hostname: string
public readonly restPort: number
Expand Down
16 changes: 4 additions & 12 deletions packages/timeline-state-resolver/src/conductor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import {
DeviceOptionsPharos,
DeviceOptionsTriCaster,
DeviceOptionsSingularLive,
DeviceOptionsVizMSE,
} from 'timeline-state-resolver-types'

import { DoOnTime } from './devices/doOnTime'
Expand All @@ -49,7 +50,6 @@ import { DeviceContainer } from './devices/deviceContainer'
import { CasparCGDevice, DeviceOptionsCasparCGInternal } from './integrations/casparCG'
import { SisyfosMessageDevice, DeviceOptionsSisyfosInternal } from './integrations/sisyfos'
import { VMixDevice, DeviceOptionsVMixInternal } from './integrations/vmix'
import { VizMSEDevice, DeviceOptionsVizMSEInternal } from './integrations/vizMSE'
import { BaseRemoteDeviceIntegration, RemoteDeviceInstance } from './service/remoteDeviceInstance'
import type { ImplementedServiceDeviceTypes } from './service/devices'
import { DeviceEvents } from './service/device'
Expand Down Expand Up @@ -517,15 +517,6 @@ export class Conductor extends EventEmitter<ConductorEvents> {
getCurrentTime,
threadedClassOptions
)
case DeviceType.VIZMSE:
return DeviceContainer.create<DeviceOptionsVizMSEInternal, typeof VizMSEDevice>(
'../../dist/integrations/vizMSE/index.js',
'VizMSEDevice',
deviceId,
deviceOptions,
getCurrentTime,
threadedClassOptions
)
case DeviceType.VMIX:
return DeviceContainer.create<DeviceOptionsVMixInternal, typeof VMixDevice>(
'../../dist/integrations/vmix/index.js',
Expand All @@ -552,7 +543,8 @@ export class Conductor extends EventEmitter<ConductorEvents> {
case DeviceType.TCPSEND:
case DeviceType.TELEMETRICS:
case DeviceType.TRICASTER:
case DeviceType.QUANTEL: {
case DeviceType.QUANTEL:
case DeviceType.VIZMSE: {
ensureIsImplementedAsService(deviceOptions.type)

// presumably this device is implemented in the new service handler
Expand Down Expand Up @@ -1478,7 +1470,7 @@ export type DeviceOptionsAnyInternal =
| DeviceOptionsSingularLive
| DeviceOptionsVMixInternal
| DeviceOptionsShotoku
| DeviceOptionsVizMSEInternal
| DeviceOptionsVizMSE
| DeviceOptionsTelemetrics
| DeviceOptionsTriCaster
| DeviceOptionsMultiOSC
Expand Down
Loading
Loading