Merge branch 'feat/R51-live-status-gateway-on-R50' into release51

Author: Julusian

meteor/CHANGELOG.md

@@ -2,14 +2,25 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-### [1.50.4](///compare/v1.50.3...v1.50.4) (2024-08-08)
+### [1.50.5](///compare/v1.50.4-LSG-updates...v1.50.5) (2024-08-08)
 
 
 ### Bug Fixes
 
-* compensate for piece preroll for adlibbed pieces SOFIE-3369 ([#1236](undefined/undefined/undefined/issues/1236)) c8f7c42
-* rundown timing drifting when playing parts with preroll SOFIE-3291 ([#1234](undefined/undefined/undefined/issues/1234)) a444857
-* unexpected timeline updates while playing final part in rundown SOFIE-3371 ([#1237](undefined/undefined/undefined/issues/1237)) 393f0c1
+* compensate for piece preroll for adlibbed pieces SOFIE-3369 ([#1236](undefined/undefined/undefined/issues/1236)) 195a7d9
+* rundown timing drifting when playing parts with preroll SOFIE-3291 ([#1234](undefined/undefined/undefined/issues/1234)) beee11a
+* unexpected timeline updates while playing final part in rundown SOFIE-3371 ([#1237](undefined/undefined/undefined/issues/1237)) 0fe74b4
+
+### [1.50.4](https://github.com/nrkno/sofie-core/compare/v1.50.3-LSG-updates...v1.50.4) (2024-07-30)
+
+
+### Bug Fixes
+
+* further improve stringifyError ([0233073](https://github.com/nrkno/sofie-core/commit/02330735fd4f3b03f9bff84e4c41fb9199a4623e))
+* improve error logging: use stringifyError() ([8da63de](https://github.com/nrkno/sofie-core/commit/8da63dec44915439ea436eee9697f3774241537b))
+* **LSG:** Token "examples" does not exist when running `yarn gendocs` ([a0ea9b4](https://github.com/nrkno/sofie-core/commit/a0ea9b48997fe39e8db5ababef744c103a68509f))
+* make stringifyError handle UserError better ([e2ecc7e](https://github.com/nrkno/sofie-core/commit/e2ecc7eb48b9ad6c0d95b299d954abac577e70a7))
+* refactor VirtualElement to be a FC ([bf81baf](https://github.com/nrkno/sofie-core/commit/bf81baf9ff520ad6a9fc9b6378ce6ceeac320645))
 
 ### [1.50.3](https://github.com/nrkno/sofie-core/compare/v1.50.2...v1.50.3) (2024-06-24)
 

meteor/client/ui/Prompter/PrompterView.tsx

@@ -52,6 +52,7 @@ interface PrompterConfig {
 	joycon_rangeNeutralMin?: number
 	joycon_rangeNeutralMax?: number
 	joycon_rangeFwdMax?: number
+	joycon_rightHandOffset?: number
 	pedal_speedMap?: number[]
 	pedal_reverseSpeedMap?: number[]
 	pedal_rangeRevMin?: number
@@ -147,6 +148,7 @@ export class PrompterViewContent extends React.Component<Translated<IProps & ITr
 			joycon_rangeNeutralMin: parseInt(firstIfArray(queryParams['joycon_rangeNeutralMin']) as string, 10) || undefined,
 			joycon_rangeNeutralMax: parseInt(firstIfArray(queryParams['joycon_rangeNeutralMax']) as string, 10) || undefined,
 			joycon_rangeFwdMax: parseInt(firstIfArray(queryParams['joycon_rangeFwdMax']) as string, 10) || undefined,
+			joycon_rightHandOffset: parseInt(firstIfArray(queryParams['joycon_rightHandOffset']) as string, 10) || undefined,
 			pedal_speedMap:
 				queryParams['pedal_speedMap'] === undefined
 					? undefined

meteor/client/ui/Prompter/controller/joycon-device.ts

@@ -17,6 +17,7 @@ export class JoyConController extends ControllerAbstract {
 	private rangeNeutralMin = -0.25 // pedal "back" position where reverse-range transistions to the neutral x
 	private rangeNeutralMax = 0.25 // pedal "front" position where scrolling starts, the 0 speed origin
 	private rangeFwdMax = 1 // pedal "all front" position where scrolling is maxed out
+	private rightHandOffset = 1.4 // factor increased by 1.4 to account for the R joystick being less sensitive than L
 	private speedMap = [1, 2, 3, 4, 5, 8, 12, 30]
 	private reverseSpeedMap = [1, 2, 3, 4, 5, 8, 12, 30]
 	private deadBand = 0.25
@@ -40,6 +41,7 @@ export class JoyConController extends ControllerAbstract {
 		this.rangeNeutralMin = view.configOptions.joycon_rangeNeutralMin || this.rangeNeutralMin
 		this.rangeNeutralMax = view.configOptions.joycon_rangeNeutralMax || this.rangeNeutralMax
 		this.rangeFwdMax = view.configOptions.joycon_rangeFwdMax || this.rangeFwdMax
+		this.rightHandOffset = view.configOptions.joycon_rightHandOffset || this.rightHandOffset
 		this.speedMap = view.configOptions.joycon_speedMap || this.speedMap
 		this.reverseSpeedMap = view.configOptions.joycon_reverseSpeedMap || this.reverseSpeedMap
 		this.deadBand = Math.min(Math.abs(this.rangeNeutralMin), Math.abs(this.rangeNeutralMax))
@@ -249,8 +251,8 @@ export class JoyConController extends ControllerAbstract {
 						if (joycon.mode === 'L') {
 							lastSeenSpeed = joycon.axes[0] * -1 // in this mode, L is "negative"
 						} else if (joycon.mode === 'R') {
-							lastSeenSpeed = joycon.axes[0] * 1.4 // in this mode, R is "positive"
-							// factor increased by 1.4 to account for the R joystick being less sensitive than L
+							lastSeenSpeed = joycon.axes[0] * this.rightHandOffset // in this mode, R is "positive"
+							// rightHandOffset allows for different rates between the two controllers
 						}
 						this.timestampOfLastUsedJoyconInput = joycon.timestamp
 					}
@@ -260,8 +262,8 @@ export class JoyConController extends ControllerAbstract {
 					if (Math.abs(joycon.axes[1]) > this.deadBand) {
 						lastSeenSpeed = joycon.axes[1] * -1 // in this mode, we are "negative" on both sticks....
 					} else if (Math.abs(joycon.axes[3]) > this.deadBand) {
-						lastSeenSpeed = joycon.axes[3] * -1.4 // in this mode, we are "negative" on both sticks....
-						// factor increased by 1.4 to account for the R joystick being less sensitive than L
+						lastSeenSpeed = joycon.axes[3] * this.rightHandOffset * -1 // in this mode, we are "negative" on both sticks....
+						// rightHandOffset allows for different rates between the two controllers
 					}
 					this.timestampOfLastUsedJoyconInput = joycon.timestamp
 				}

meteor/client/ui/Settings/components/GenericDeviceSettingsComponent.tsx

@@ -9,6 +9,7 @@ import { JSONBlobParse } from '@sofie-automation/shared-lib/dist/lib/JSONBlob'
 import { PeripheralDevices } from '../../../collections'
 import { MeteorCall } from '../../../../lib/api/methods'
 import { PeripheralDeviceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 interface IGenericDeviceSettingsComponentProps {
 	device: PeripheralDevice
@@ -39,7 +40,7 @@ export function GenericDeviceSettingsComponent({
 						}
 						setDebugStates(states)
 					})
-					.catch((err) => console.log(`Error fetching device states: ${err}`))
+					.catch((err) => console.log(`Error fetching device states: ${stringifyError(err)}`))
 			}, 1000)
 
 			return () => {

meteor/client/ui/Status/SystemStatus.tsx

@@ -39,6 +39,7 @@ import { ClientAPI } from '../../../lib/api/client'
 import { catchError } from '../../lib/lib'
 import { logger } from '../../../lib/logging'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 interface IDeviceItemProps {
 	parentDevice: PeripheralDevice | null
@@ -596,7 +597,7 @@ const SystemStatusContent = reacti18next.withTranslation()(
 								deviceDebugState: states,
 							})
 						})
-						.catch((err) => console.log(`Error fetching device states: ${err}`))
+						.catch((err) => console.log(`Error fetching device states: ${stringifyError(err)}`))
 				}
 			}
 		}

meteor/lib/clientUserAction.ts

@@ -269,9 +269,10 @@ export function eventContextForLog(e: any): [string, Time] {
 		str = e.type
 	}
 	if (!str) {
-		logger.error(
-			'Could not create context in eventContextForLog, because provided event had no identifiable type',
-			e
+		logger.warn(
+			`Could not create context in eventContextForLog, because provided event had no identifiable type: ${JSON.stringify(
+				e
+			)}, stack: ${new Error().stack}`
 		)
 		str = 'N/A'
 	}

meteor/server/api/deviceTriggers/observer.ts

@@ -17,6 +17,7 @@ import { StudioDeviceTriggerManager } from './StudioDeviceTriggerManager'
 import { StudioObserver } from './StudioObserver'
 import { Studios } from '../../collections'
 import { ReactiveCacheCollection } from '../../publications/lib/ReactiveCacheCollection'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 type ObserverAndManager = {
 	observer: StudioObserver
@@ -34,8 +35,7 @@ Meteor.startup(() => {
 
 	function workInQueue(fnc: () => Promise<void>) {
 		jobQueue.add(fnc).catch((e) => {
-			logger.error(`Error in DeviceTriggers Studio observer reaction: ${e}`)
-			logger.error(e)
+			logger.error(`Error in DeviceTriggers Studio observer reaction: ${stringifyError(e)}`)
 		})
 	}
 

meteor/server/api/ingest/lib.ts

@@ -139,7 +139,7 @@ function updateDeviceLastDataReceived(deviceId: PeripheralDeviceId) {
 			lastDataReceived: getCurrentTime(),
 		},
 	}).catch((err) => {
-		logger.error(`Error in updateDeviceLastDataReceived "${deviceId}": ${err}`)
+		logger.error(`Error in updateDeviceLastDataReceived "${deviceId}": ${stringifyError(err)}`)
 	})
 }
 

meteor/server/api/ingest/packageInfo.ts

@@ -16,6 +16,7 @@ import { ExpectedPackageId, RundownId } from '@sofie-automation/corelib/dist/dat
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { QueueStudioJob } from '../../worker/worker'
 import { StudioJobs } from '@sofie-automation/corelib/dist/worker/studio'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 export async function onUpdatedPackageInfo(packageId: ExpectedPackageId, _doc: PackageInfoDB | null): Promise<void> {
 	logger.info(`PackageInfo updated "${packageId}"`)
@@ -68,7 +69,9 @@ function onUpdatedPackageInfoForRundownDebounce(pkg: ExpectedPackageFromRundown
 			if (packageIds) {
 				pendingRundownPackageUpdates.delete(pkg.rundownId)
 				onUpdatedPackageInfoForRundown(pkg.rundownId, packageIds).catch((e) => {
-					logger.error(`Updating ExpectedPackages for Rundown "${pkg.rundownId}" failed: ${e}`)
+					logger.error(
+						`Updating ExpectedPackages for Rundown "${pkg.rundownId}" failed: ${stringifyError(e)}`
+					)
 				})
 			}
 		},
@@ -114,7 +117,9 @@ function onUpdatedPackageInfoForBucketItemDebounce(
 				externalId: pkg.pieceExternalId,
 			}).catch((err) => {
 				logger.error(
-					`Updating ExpectedPackages for Bucket "${pkg.bucketId}" Item "${pkg.pieceExternalId}" failed: ${err}`
+					`Updating ExpectedPackages for Bucket "${pkg.bucketId}" Item "${
+						pkg.pieceExternalId
+					}" failed: ${stringifyError(err)}`
 				)
 			})
 		},
@@ -131,7 +136,9 @@ function onUpdatedPackageInfoForStudioBaselineDebounce(pkg: ExpectedPackageDBFro
 					await job.complete
 				})
 				.catch((err) => {
-					logger.error(`Updating ExpectedPackages for StudioBaseline "${pkg.studioId}" failed: ${err}`)
+					logger.error(
+						`Updating ExpectedPackages for StudioBaseline "${pkg.studioId}" failed: ${stringifyError(err)}`
+					)
 				})
 		},
 		1000

meteor/server/api/peripheralDevice/executeFunction.ts

@@ -4,6 +4,7 @@ import { createManualPromise, getCurrentTime, getRandomId } from '../../../lib/l
 import { PeripheralDeviceCommands } from '../../collections'
 import { logger } from '../../logging'
 import { TSR } from '@sofie-automation/blueprints-integration'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 export async function executePeripheralDeviceFunctionWithCustomTimeout(
 	deviceId: PeripheralDeviceId,
@@ -70,7 +71,9 @@ export async function executePeripheralDeviceFunctionWithCustomTimeout(
 
 					observer?.stop()
 					PeripheralDeviceCommands.removeAsync(cmdId).catch((e) => {
-						logger.error(`Cleanup PeripheralDeviceCommand "${commandId}" document failed: ${e}`)
+						logger.error(
+							`Cleanup PeripheralDeviceCommand "${commandId}" document failed: ${stringifyError(e)}`
+						)
 					})
 				}
 
@@ -118,7 +121,7 @@ export async function executePeripheralDeviceFunctionWithCustomTimeout(
 
 	const doCheckReply = () => {
 		checkReply().catch((e) => {
-			logger.error(`PeripheralDeviceCommand "${commandId}" check failed: ${e}`)
+			logger.error(`PeripheralDeviceCommand "${commandId}" check failed: ${stringifyError(e)}`)
 		})
 	}