Merge branch 'develop' into feat/button-view

SuperFlyTV · Jan 24, 2024 · 83023b1 · 83023b1
2 parents ac6f854 + b3174d5
commit 83023b1
Show file tree

Hide file tree

Showing 41 changed files with 1,430 additions and 379 deletions.
diff --git a/README.md b/README.md
@@ -8,22 +8,22 @@ A playout client for _Windows/Linux/macOS_ that will let you control _CasparCG&n
 
 ### Windows
 
-- Download and open the [installer for SuperConductor](https://github.com/SuperFlyTV/SuperConductor/releases/download/v0.11.1/SuperConductor-0.11.1-Windows-Installer.exe).
-- (Optional) Download and open the [installer for separate TSR-Bridge](https://github.com/SuperFlyTV/SuperConductor/releases/download/v0.11.1/TSR-Bridge-0.11.1-Windows-Installer.exe).
+- Download and open the [installer for SuperConductor](https://github.com/SuperFlyTV/SuperConductor/releases/download/v0.11.2/SuperConductor-0.11.2-Windows-Installer.exe).
+- (Optional) Download and open the [installer for separate TSR-Bridge](https://github.com/SuperFlyTV/SuperConductor/releases/download/v0.11.2/TSR-Bridge-0.11.2-Windows-Installer.exe).
 
 ### Linux (Ubuntu)
 
-- Download the [.appImage file for SuperConductor](https://github.com/SuperFlyTV/SuperConductor/releases/download/v0.11.1/SuperConductor-0.11.1-Linux-Executable.AppImage).<br/>
+- Download the [.appImage file for SuperConductor](https://github.com/SuperFlyTV/SuperConductor/releases/download/v0.11.2/SuperConductor-0.11.2-Linux-Executable.AppImage).<br/>
   Execute the following before running the file:<br/>
-  `chmod +x Downloads/SuperConductor-0.11.1-Linux-Executable.AppImage`
-- (Optional) Download the [.appImage file for TSR-Bridge](https://github.com/SuperFlyTV/SuperConductor/releases/download/v0.11.1/TSR-Bridge-0.11.1-Linux-Executable.AppImage).<br/>
+  `chmod +x Downloads/SuperConductor-0.11.2-Linux-Executable.AppImage`
+- (Optional) Download the [.appImage file for TSR-Bridge](https://github.com/SuperFlyTV/SuperConductor/releases/download/v0.11.2/TSR-Bridge-0.11.2-Linux-Executable.AppImage).<br/>
   Execute the following before running the file:<br/>
-  `chmod +x Downloads/TSR-Bridge-0.11.1-Linux-Executable.AppImage`
+  `chmod +x Downloads/TSR-Bridge-0.11.2-Linux-Executable.AppImage`
 
 ### macOS
 
-- Download and open the [installer for SuperConductor](https://github.com/SuperFlyTV/SuperConductor/releases/download/v0.11.1/SuperConductor-0.11.1-macOS-Installer.dmg).
-- (Optional) Download and open the [installer for separate TSR-Bridge](https://github.com/SuperFlyTV/SuperConductor/releases/download/v0.11.1/TSR-Bridge-0.11.1-macOS-Installer.dmg).
+- Download and open the [installer for SuperConductor](https://github.com/SuperFlyTV/SuperConductor/releases/download/v0.11.2/SuperConductor-0.11.2-macOS-Installer.dmg).
+- (Optional) Download and open the [installer for separate TSR-Bridge](https://github.com/SuperFlyTV/SuperConductor/releases/download/v0.11.2/TSR-Bridge-0.11.2-macOS-Installer.dmg).
 
 ## Problems and Issues
 

diff --git a/apps/app/package.json b/apps/app/package.json
@@ -92,6 +92,7 @@
 		"deepmerge-ts": "^5.1.0",
 		"electron-is-dev": "^2.0.0",
 		"electron-updater": "^5.3.0",
+		"eventemitter3": "^5.0.1",
 		"file-loader": "^6.2.0",
 		"formik": "^2.2.9",
 		"formik-mui": "^5.0.0-alpha.0",

diff --git a/apps/app/src/electron/ClientEventBus.ts b/apps/app/src/electron/ClientEventBus.ts
@@ -11,10 +11,18 @@ import { ActiveAnalog } from '../models/rundown/Analog'
 import { AnalogInput } from '../models/project/AnalogInput'
 import { BridgeId } from '@shared/api'
 import { BridgePeripheralId } from '@shared/lib'
-import { EventEmitter } from 'stream'
+import EventEmitter from 'eventemitter3'
+import { SerializableLedgers } from '../models/project/Project'
+
+type ClientEventBusEvents = {
+	callMethod: (...args: any[]) => void // legacy
+	updateUndoLedgers: (undoLedgers: SerializableLedgers) => void
+	updateRundown: (rundown: Rundown) => void
+	updateProject: (rundown: Project) => void
+}
 
 // --- some of it might be needed, most of it hopefully not
-export class ClientEventBus extends EventEmitter implements IPCClientMethods {
+export class ClientEventBus extends EventEmitter<ClientEventBusEvents> implements IPCClientMethods {
 	close(): void {
 		// Nothing here
 	}
@@ -26,10 +34,13 @@ export class ClientEventBus extends EventEmitter implements IPCClientMethods {
 		this.emit('callMethod', 'updateAppData', appData)
 	}
 	updateProject(project: Project): void {
-		this.emit('updateProject', project) // TODO: some type safety, please
+		this.emit('updateProject', project)
 	}
 	updateRundown(_fileName: string, rundown: Rundown): void {
-		this.emit('updateRundown', rundown) // TODO: some type safety, please
+		this.emit('updateRundown', rundown)
+	}
+	updateUndoLedgers(data: SerializableLedgers): void {
+		this.emit('updateUndoLedgers', data)
 	}
 	updateResourcesAndMetadata(
 		resources: Array<{ id: ResourceId; resource: ResourceAny | null }>,