yarn build now runs successfully

SuperFlyTV · Apr 4, 2024 · 406f8ac · 406f8ac
1 parent 8af3262
commit 406f8ac
Show file tree

Hide file tree

Showing 10 changed files with 279 additions and 163 deletions.
diff --git a/packages/quick-tsr/input/mappings.ts b/packages/quick-tsr/input/mappings.ts
@@ -1,4 +1,4 @@
-import { DeviceType, Mapping, MappingCasparCGType, SomeMappingCasparCG } from 'timeline-state-resolver'
+import { DeviceType, Mapping, SomeMappingArtNet } from 'timeline-state-resolver'
 import { literal } from 'timeline-state-resolver/dist/lib'
 import type { TSRInput } from '../src'
 
@@ -8,11 +8,11 @@ export const input: TSRInput = {
 			device: DeviceType.ARTNET,
 			deviceId: 'universe0',
 			options: {
-                universe: 0,
+				universe: 0,
 				profileMappings: {
 					// Maps dimmer to channel 1:
-                    "dimmer": 1,
-                }
+					"dimmer": 1,
+				}
 			},
 		}),
 		rgb0: literal<Mapping<SomeMappingArtNet>>({
@@ -22,8 +22,8 @@ export const input: TSRInput = {
 				universe: 0,
 				profileMappings: {
 					"dimmer": 6,
-                    "RGB": [7,8,9],
-                }
+					"RGB": [7,8,9],
+				}
 			},
 		}),
 		rgb0_dimmer: literal<Mapping<SomeMappingArtNet>>({
@@ -33,18 +33,18 @@ export const input: TSRInput = {
 				universe: 0,
 				profileMappings: {
 					"dimmer": 6,
-                }
+				}
 			},
 		}),
 		dimmerGroup0: literal<Mapping<SomeMappingArtNet>>({
 			device: DeviceType.ARTNET,
 			deviceId: 'universe0',
 			options: {
-                universe: 0,
+				universe: 0,
 				profileMappings: {
 					// Maps dimmers to channel group:
-                    "dimmers": [11, 12, 13, 14, 15, 16, 17, 18],
-                }
+					"dimmers": [11, 12, 13, 14, 15, 16, 17, 18],
+				}
 			},
 		}),
 
@@ -56,8 +56,8 @@ export const input: TSRInput = {
 				profileMappings: {
 					// "everything": ['1-50', '100-512'],
 					"everything": '1-512'
-                    
-                }
+					
+				}
 			},
 		}),
 	},

diff --git a/packages/quick-tsr/input/timeline.ts b/packages/quick-tsr/input/timeline.ts
@@ -1,7 +1,9 @@
 import {
-	DeviceType,
-	TimelineContentTypeCasparCg,
-	TimelineContentCCGMedia,
+	// DeviceType,
+	// TimelineContentTypeCasparCg,
+	// TimelineContentCCGMedia,
+	TimelineContentArtNetAny,
+	TimelineContentArtNetValues,
 	TSRTimelineObj,
 } from 'timeline-state-resolver'
 import { TSRInput } from '../src'
@@ -10,15 +12,15 @@ import { literal } from 'timeline-state-resolver/dist/lib'
 export const input: TSRInput = {
 	timeline: [
 
-		literal<TSRTimelineObj<TimelineContentArtNetValues>>({
+		literal<TSRTimelineObj<TimelineContentArtNetAny>>({
 			id: 'artnet0',
 			enable: {
 				start: Date.now(),
 				duration: 20 * 1000
 			},
 			layer: 'dimmer00',
 			content: {
-                values: {
+				values: {
 					dimmer: 255
 				}
 			}
@@ -102,66 +104,60 @@ export const input: TSRInput = {
 					everything: 255
 				}
 			}
-		})
-
-
-
-
-
-
+		}),
 
-		literal<TSRTimelineObj<TimelineContentCCGMedia>>({
-			id: 'video0',
-			enable: {
-				start: Date.now(),
-				duration: 20 * 1000,
-			},
-			layer: 'casparLayer0',
-			content: {
-				deviceType: DeviceType.CASPARCG,
-				type: TimelineContentTypeCasparCg.MEDIA,
-				file: 'amb.mp4',
-				mixer: {
-					rotation: 0,
-					// anchor: {
-					// 	x: 0.5,
-					// 	y: 0.5,
-					// },
-					fill: {
-						x: 0.5,
-						y: 0.5,
-						xScale: 0.7,
-						yScale: 1,
-					},
-				},
+		// literal<TSRTimelineObj<TimelineContentCCGMedia>>({
+		// 	id: 'video0',
+		// 	enable: {
+		// 		start: Date.now(),
+		// 		duration: 20 * 1000,
+		// 	},
+		// 	layer: 'casparLayer0',
+		// 	content: {
+		// 		deviceType: DeviceType.CASPARCG,
+		// 		type: TimelineContentTypeCasparCg.MEDIA,
+		// 		file: 'amb.mp4',
+		// 		mixer: {
+		// 			rotation: 0,
+		// 			// anchor: {
+		// 			// 	x: 0.5,
+		// 			// 	y: 0.5,
+		// 			// },
+		// 			fill: {
+		// 				x: 0.5,
+		// 				y: 0.5,
+		// 				xScale: 0.7,
+		// 				yScale: 1,
+		// 			},
+		// 		},
 
-				// $references: {
-				// 	'mixer.fill.xScale': {
-				// 		// Local path to overwrite
-				// 		datastoreKey: 'scale', // Reference key in datastore
-				// 		overwrite: false,
-				// 	},
-				// 	'mixer.fill.yScale': {
-				// 		// Local path to overwrite
-				// 		datastoreKey: 'scale', // Reference key in datastore
-				// 		overwrite: false,
-				// 	},
-				// },
-			},
-			keyframes: [
-				{
-					id: 'kf0',
-					enable: {
-						while: true,
-						// start: '#video0.start + 10',
-					},
-					content: {
-						mixer: {
-							rotation: 90
-						}
-					}
-				}
-			]
-		}),
+		// 		// $references: {
+		// 		// 	'mixer.fill.xScale': {
+		// 		// 		// Local path to overwrite
+		// 		// 		datastoreKey: 'scale', // Reference key in datastore
+		// 		// 		overwrite: false,
+		// 		// 	},
+		// 		// 	'mixer.fill.yScale': {
+		// 		// 		// Local path to overwrite
+		// 		// 		datastoreKey: 'scale', // Reference key in datastore
+		// 		// 		overwrite: false,
+		// 		// 	},
+		// 		// },
+		// 	},
+		// 	keyframes: [
+		// 		{
+		// 			id: 'kf0',
+		// 			enable: {
+		// 				while: true,
+		// 				// start: '#video0.start + 10',
+		// 			},
+		// 			content: {
+		// 				mixer: {
+		// 					rotation: 90
+		// 				}
+		// 			}
+		// 		}
+		// 	]
+		// }),
 	],
 }
diff --git a/packages/timeline-state-resolver-types/src/device.ts b/packages/timeline-state-resolver-types/src/device.ts
@@ -22,6 +22,7 @@ import {
 	TelemetricsOptions,
 	TriCasterOptions,
 	MultiOSCOptions,
+	ArtNetOptions,
 } from '.'
 import { DeviceCommonOptions } from './generated/common-options'
 
@@ -76,6 +77,7 @@ export type DeviceOptionsAny =
 	| DeviceOptionsTelemetrics
 	| DeviceOptionsTriCaster
 	| DeviceOptionsMultiOSC
+	| DeviceOptionsArtNet
 
 export interface DeviceOptionsAbstract extends DeviceOptionsBase<AbstractOptions> {
 	type: DeviceType.ABSTRACT
@@ -143,3 +145,6 @@ export interface DeviceOptionsTriCaster extends DeviceOptionsBase<TriCasterOptio
 export interface DeviceOptionsMultiOSC extends DeviceOptionsBase<MultiOSCOptions> {
 	type: DeviceType.MULTI_OSC
 }
+export interface DeviceOptionsArtNet extends DeviceOptionsBase<ArtNetOptions> {
+	type: DeviceType.ARTNET
+}
diff --git a/packages/timeline-state-resolver-types/src/generated/artnet.ts b/packages/timeline-state-resolver-types/src/generated/artnet.ts
@@ -7,8 +7,11 @@
 
 export interface ArtNetOptions {
 	host: string
-	mode: Mode
-	fps: number
+	mode?: Mode
+	fps?: number
+	channelBehavious?: {
+		[k: string]: unknown
+	}
 }
 
 export enum Mode {
@@ -21,8 +24,16 @@ export interface MappingArtnetUniverse {
 	mappingType: MappingArtnetType.Universe
 }
 
+export interface MappingArtnetProfileMappings {
+	ID: string
+	channels: string
+	mappingType: MappingArtnetType.ProfileMappings
+	[k: string]: unknown
+}
+
 export enum MappingArtnetType {
 	Universe = 'universe',
+	ProfileMappings = 'profileMappings',
 }
 
-export type SomeMappingArtnet = MappingArtnetUniverse
+export type SomeMappingArtnet = MappingArtnetUniverse | MappingArtnetProfileMappings
diff --git a/packages/timeline-state-resolver-types/src/integrations/artnet.ts b/packages/timeline-state-resolver-types/src/integrations/artnet.ts
@@ -21,13 +21,23 @@ export enum TimelineContentTypeArtNet {
 export interface TimelineContentArtNet {
 	deviceType: DeviceType.ARTNET
 	type: TimelineContentTypeArtNet
-    channel: number
-    value: number
-    trasition?: {
-        duration: number,
-        type: ArtNetEasingType,
-        direction: 'In' | 'Out' | 'InOut' | 'None'
-    }
+	channel: number
+	value: number
+	trasition?: {
+		duration: number,
+		type: ArtNetEasingType,
+		direction: 'In' | 'Out' | 'InOut' | 'None'
+	}
+}
+
+export interface ArtNetDeviceCommand {
+	channel: number
+	value: number
+}
+
+export interface ArtNetCommandContent {
+	ID: string
+	values: number | Array<number>
 }
 
 export type TimelineContentArtNetAny = TimelineContentArtNet

diff --git a/packages/timeline-state-resolver/src/conductor.ts b/packages/timeline-state-resolver/src/conductor.ts
@@ -33,6 +33,7 @@ import {
 	DeviceOptionsHyperdeck,
 	DeviceOptionsPanasonicPTZ,
 	DeviceOptionsLawo,
+	DeviceOptionsArtNet,
 } from 'timeline-state-resolver-types'
 
 import { DoOnTime } from './devices/doOnTime'
@@ -592,6 +593,7 @@ export class Conductor extends EventEmitter<ConductorEvents> {
 					threadedClassOptions
 				)
 			case DeviceType.ABSTRACT:
+			case DeviceType.ARTNET:
 			case DeviceType.ATEM:
 			case DeviceType.HTTPSEND:
 			case DeviceType.HTTPWATCHER:
@@ -1527,6 +1529,7 @@ export type DeviceOptionsAnyInternal =
 	| DeviceOptionsTelemetrics
 	| DeviceOptionsTriCasterInternal
 	| DeviceOptionsMultiOSC
+	| DeviceOptionsArtNet
 
 function removeParentFromState(
 	o: Timeline.TimelineState<TSRTimelineContent>

diff --git a/packages/timeline-state-resolver/src/integrations/artnet/$schemas/mappings.json b/packages/timeline-state-resolver/src/integrations/artnet/$schemas/mappings.json
@@ -1,22 +1,35 @@
 {
 	"$schema": "../../../$schemas/mapping-schema.json",
-	"default": "universe",
+	"default": "mappings",
 	"mappings": {
 		"universe": {
 			"type": "object",
 			"properties": {
-                "universe": {
-                    "type": "integer",
-                    "ui:title": "Universe",
-                    "ui:description": "The artnet universe to output to (0-32767)",
-                    "ui:summaryTitle": "Universe",
-                    "default": 0,
-                    "min": 0,
-                    "max": 32767
-                }
+				"universe": {
+					"type": "integer",
+					"ui:title": "Universe",
+					"ui:description": "The artnet universe to output to (0-32767)",
+					"ui:summaryTitle": "Universe",
+					"default": 0,
+					"min": 0,
+					"max": 32767
+				}
 			},
 			"required": ["universe"],
 			"additionalProperties": false
+		},
+		"profileMappings": {
+			"type": "object",
+			"properties": {
+				"ID": {
+					"type": "string"
+				},
+				"channels": {
+					"type": "string"
+				}
+			},
+			"required": ["ID", "channels"],
+			"additionalProperties": true
 		}
 	}
 }