From 54d031a9eddbaa06a2165c41a3da5a20fea610e9 Mon Sep 17 00:00:00 2001
From: Mint de Wit <mint@superfly.tv>
Date: Tue, 2 Jan 2024 12:27:09 +0100
Subject: [PATCH] fix: update failing ccg-connection

---
 packages/timeline-state-resolver/package.json |  2 +-
 .../src/integrations/casparCG/index.ts        | 14 ++++++++---
 yarn.lock                                     | 24 ++++++++++++++++++-
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/packages/timeline-state-resolver/package.json b/packages/timeline-state-resolver/package.json
index a4de2e21e..0535196d6 100644
--- a/packages/timeline-state-resolver/package.json
+++ b/packages/timeline-state-resolver/package.json
@@ -92,7 +92,7 @@
 		"@tv2media/v-connection": "^7.3.0",
 		"atem-connection": "2.5.0",
 		"atem-state": "0.13.0",
-		"casparcg-connection": "^6.0.6",
+		"casparcg-connection": "6.2.0-nightly-master-20240102-111829-2fe75295.0",
 		"casparcg-state": "^3.0.2",
 		"debug": "^4.3.1",
 		"deepmerge": "^4.2.2",
diff --git a/packages/timeline-state-resolver/src/integrations/casparCG/index.ts b/packages/timeline-state-resolver/src/integrations/casparCG/index.ts
index f33da0399..373ad4343 100644
--- a/packages/timeline-state-resolver/src/integrations/casparCG/index.ts
+++ b/packages/timeline-state-resolver/src/integrations/casparCG/index.ts
@@ -1,7 +1,15 @@
 import * as _ from 'underscore'
 import * as deepMerge from 'deepmerge'
 import { DeviceWithState, CommandWithContext, DeviceStatus, StatusCode, literal } from '../../devices/device'
-import { AMCPCommand, BasicCasparCGAPI, ClearCommand, Commands, Response } from 'casparcg-connection'
+import {
+	AMCPCommand,
+	BasicCasparCGAPI,
+	ClearCommand,
+	Commands,
+	InfoChannelCommand,
+	InfoChannelEntry,
+	Response,
+} from 'casparcg-connection'
 import {
 	DeviceType,
 	TimelineContentTypeCasparCg,
@@ -117,7 +125,7 @@ export class CasparCGDevice extends DeviceWithState<State, DeviceOptionsCasparCG
 
 					const response = await request
 
-					const channelPromises: Promise<Response>[] = []
+					const channelPromises: Promise<Response<InfoChannelEntry | undefined>>[] = []
 					const channelLength: number = response?.data?.['length'] ?? 0
 
 					// Issue commands
@@ -125,7 +133,7 @@ export class CasparCGDevice extends DeviceWithState<State, DeviceOptionsCasparCG
 						// 1-based index for channels
 
 						const { error, request } = await this._ccg.executeCommand({
-							command: Commands.Info,
+							command: Commands.InfoChannel,
 							params: { channel: i },
 						})
 						if (error) {
diff --git a/yarn.lock b/yarn.lock
index fcc5a7648..baadc5302 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2802,7 +2802,16 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
-casparcg-connection@^6.0.0, casparcg-connection@^6.0.6:
+casparcg-connection@6.2.0-nightly-master-20240102-111829-2fe75295.0:
+  version "6.2.0-nightly-master-20240102-111829-2fe75295.0"
+  resolved "https://registry.yarnpkg.com/casparcg-connection/-/casparcg-connection-6.2.0-nightly-master-20240102-111829-2fe75295.0.tgz#3262f89cd7b50b57aad13616b2e2a119f0f6289a"
+  integrity sha512-+RLEEaxXA0qVj5XT3iv89X1WIJs8UgyDH/RCL/YB9OhvHv1LPxn9mMLH+6atuAmU77HWZwyZ4Q27sQCuu9U9LA==
+  dependencies:
+    eventemitter3 "^5.0.1"
+    tslib "^2.5.0"
+    xml2js "^0.6.2"
+
+casparcg-connection@^6.0.0:
   version "6.0.6"
   resolved "https://registry.yarnpkg.com/casparcg-connection/-/casparcg-connection-6.0.6.tgz#88975bb9b1f1ee6db89ab420ca058fde79b01d2f"
   integrity sha512-VFGKg1KslF0mMteZoCz2gQBN+KYUbM3YiNsVWTUNyPuDV6o57iP8V++LY8geAKRYSjQ/RTB4I1QI81L7QZeJaA==
@@ -3943,6 +3952,11 @@ eventemitter3@^4.0.4, eventemitter3@^4.0.7:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
+eventemitter3@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4"
+  integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==
+
 events@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
@@ -9219,6 +9233,14 @@ xml2js@^0.4.23:
     sax ">=0.6.0"
     xmlbuilder "~11.0.0"
 
+xml2js@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.6.2.tgz#dd0b630083aa09c161e25a4d0901e2b2a929b499"
+  integrity sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~11.0.0"
+
 xmlbuilder@~11.0.0:
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"