Merge remote-tracking branch 'origin/release51' into release51

Author: Julusian

packages/live-status-gateway/src/collections/partInstancesHandler.ts

@@ -138,18 +138,25 @@ export class PartInstancesHandler
 					void this.changed(id, 'removed').catch(this._logger.error)
 				}
 
-				const hasAnythingChanged = this.updateCollectionData()
-				if (hasAnythingChanged) {
-					await this.notify(this._collectionData)
-				}
+				await this.updateAndNotify()
 			} else if (this._subscriptionId) {
-				// nothing relevant has changed
+				await this.updateAndNotify()
 			} else {
-				this.clearCollectionData()
-				await this.notify(this._collectionData)
+				await this.clearAndNotify()
 			}
 		} else {
-			this.clearCollectionData()
+			await this.clearAndNotify()
+		}
+	}
+
+	private async clearAndNotify() {
+		this.clearCollectionData()
+		await this.notify(this._collectionData)
+	}
+
+	private async updateAndNotify() {
+		const hasAnythingChanged = this.updateCollectionData()
+		if (hasAnythingChanged) {
 			await this.notify(this._collectionData)
 		}
 	}

packages/live-status-gateway/src/collections/pieceInstancesHandler.ts

@@ -82,12 +82,13 @@ export class PieceInstancesHandler
 		}
 		if (
 			!areElementsShallowEqual(this._collectionData.currentPartInstance, inCurrentPartInstance) &&
-			this._collectionData.currentPartInstance.some((pieceInstance, index) => {
-				return !arePropertiesShallowEqual<PieceInstance>(inCurrentPartInstance[index], pieceInstance, [
-					'reportedStartedPlayback',
-					'reportedStoppedPlayback',
-				])
-			})
+			(this._collectionData.currentPartInstance.length !== inCurrentPartInstance.length ||
+				this._collectionData.currentPartInstance.some((pieceInstance, index) => {
+					return !arePropertiesShallowEqual<PieceInstance>(inCurrentPartInstance[index], pieceInstance, [
+						'reportedStartedPlayback',
+						'reportedStoppedPlayback',
+					])
+				}))
 		) {
 			this._collectionData.currentPartInstance = inCurrentPartInstance
 			hasAnythingChanged = true
@@ -153,22 +154,30 @@ export class PieceInstancesHandler
 					void this.changed(id, 'removed').catch(this._logger.error)
 				}
 
-				const hasAnythingChanged = this.updateCollectionData()
-				if (hasAnythingChanged) {
-					await this.notify(this._collectionData)
-				}
+				await this.updateAndNotify()
 			} else if (this._subscriptionId) {
-				// nothing relevant has changed
+				await this.updateAndNotify()
 			} else {
-				this.clearCollectionData()
-				await this.notify(this._collectionData)
+				await this.clearAndNotify()
 			}
 		} else {
 			this.clearCollectionData()
 			await this.notify(this._collectionData)
 		}
 	}
 
+	private async clearAndNotify() {
+		this.clearCollectionData()
+		await this.notify(this._collectionData)
+	}
+
+	private async updateAndNotify() {
+		const hasAnythingChanged = this.updateCollectionData()
+		if (hasAnythingChanged) {
+			await this.notify(this._collectionData)
+		}
+	}
+
 	private isPieceInstanceActive(pieceInstance: PieceInstance) {
 		return (
 			pieceInstance.reportedStoppedPlayback == null &&
@@ -187,7 +196,7 @@ export function arePropertiesShallowEqual<T extends Record<string, any>>(
 	b: T,
 	omitProperties: Array<keyof T>
 ): boolean {
-	if (typeof a !== 'object' || a === null || typeof b !== 'object' || b === null) {
+	if (typeof a !== 'object' || a == null || typeof b !== 'object' || b == null) {
 		return false
 	}
 

packages/live-status-gateway/src/topics/activePlaylistTopic.ts

@@ -134,7 +134,7 @@ export class ActivePlaylistTopic
 								autoNext: nextPart.autoNext,
 								segmentId: unprotectString(nextPart.segmentId),
 								pieces:
-									this._pieceInstancesInCurrentPartInstance?.map((piece) =>
+									this._pieceInstancesInNextPartInstance?.map((piece) =>
 										toPieceStatus(piece, this._showStyleBaseExt)
 									) ?? [],
 								publicData: nextPart.publicData,