From 2aeb9cf0ef5c3d6b7a75b70f17e9e958931231b6 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Thu, 25 Sep 2025 17:47:59 +0200 Subject: [PATCH] Revert "Update dependency @types/chromecast-caf-receiver to v6.0.24 (#26500)" This reverts commit 4a3ed625831b98d4309ae160d8329bd92df3068b. --- cast/src/media/entrypoint.ts | 6 +++--- cast/src/receiver/entrypoint.ts | 22 ++++++++++++---------- package.json | 2 +- yarn.lock | 10 +++++----- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/cast/src/media/entrypoint.ts b/cast/src/media/entrypoint.ts index 9d59ed37d4..ac8e150382 100644 --- a/cast/src/media/entrypoint.ts +++ b/cast/src/media/entrypoint.ts @@ -5,17 +5,17 @@ const castContext = framework.CastReceiverContext.getInstance(); const playerManager = castContext.getPlayerManager(); playerManager.setMessageInterceptor( - "LOAD" as framework.messages.MessageType.LOAD, + framework.messages.MessageType.LOAD, (loadRequestData) => { const media = loadRequestData.media; // Special handling if it came from Google Assistant if (media.entity) { media.contentId = media.entity; - media.streamType = "LIVE" as framework.messages.StreamType.LIVE; + media.streamType = framework.messages.StreamType.LIVE; media.contentType = "application/vnd.apple.mpegurl"; // @ts-ignore media.hlsVideoSegmentFormat = - "fmp4" as framework.messages.HlsVideoSegmentFormat.FMP4; + framework.messages.HlsVideoSegmentFormat.FMP4; } return loadRequestData; } diff --git a/cast/src/receiver/entrypoint.ts b/cast/src/receiver/entrypoint.ts index 1ff18641fb..afdb19a36a 100644 --- a/cast/src/receiver/entrypoint.ts +++ b/cast/src/receiver/entrypoint.ts @@ -40,8 +40,7 @@ const playDummyMedia = (viewTitle?: string) => { loadRequestData.media.contentId = "https://cast.home-assistant.io/images/google-nest-hub.png"; loadRequestData.media.contentType = "image/jpeg"; - loadRequestData.media.streamType = - "NONE" as framework.messages.StreamType.NONE; + loadRequestData.media.streamType = framework.messages.StreamType.NONE; const metadata = new framework.messages.GenericMediaMetadata(); metadata.title = viewTitle; loadRequestData.media.metadata = metadata; @@ -90,7 +89,7 @@ const showMediaPlayer = () => { const options = new framework.CastReceiverOptions(); options.disableIdleTimeout = true; options.customNamespaces = { - [CAST_NS]: "json" as framework.system.MessageType.JSON, + [CAST_NS]: framework.system.MessageType.JSON, }; castContext.addCustomMessageListener( @@ -98,7 +97,9 @@ castContext.addCustomMessageListener( // @ts-ignore (ev: ReceivedMessage) => { // We received a show Lovelace command, stop media from playing, hide media player and show Lovelace controller - if (playerManager.getPlayerState() !== "IDLE") { + if ( + playerManager.getPlayerState() !== framework.messages.PlayerState.IDLE + ) { playerManager.stop(); } else { showLovelaceController(); @@ -112,7 +113,7 @@ castContext.addCustomMessageListener( const playerManager = castContext.getPlayerManager(); playerManager.setMessageInterceptor( - "LOAD" as framework.messages.MessageType.LOAD, + framework.messages.MessageType.LOAD, (loadRequestData) => { if ( loadRequestData.media.contentId === @@ -126,23 +127,24 @@ playerManager.setMessageInterceptor( // Special handling if it came from Google Assistant if (media.entity) { media.contentId = media.entity; - media.streamType = "LIVE" as framework.messages.StreamType.LIVE; + media.streamType = framework.messages.StreamType.LIVE; media.contentType = "application/vnd.apple.mpegurl"; // @ts-ignore media.hlsVideoSegmentFormat = - "fmp4" as framework.messages.HlsVideoSegmentFormat.FMP4; + framework.messages.HlsVideoSegmentFormat.FMP4; } return loadRequestData; } ); playerManager.addEventListener( - "MEDIA_STATUS" as framework.events.EventType.MEDIA_STATUS, + framework.events.EventType.MEDIA_STATUS, (event) => { if ( - event.mediaStatus?.playerState === "IDLE" && + event.mediaStatus?.playerState === framework.messages.PlayerState.IDLE && event.mediaStatus?.idleReason && - event.mediaStatus?.idleReason !== "INTERRUPTED" + event.mediaStatus?.idleReason !== + framework.messages.IdleReason.INTERRUPTED ) { // media finished or stopped, return to default Lovelace showLovelaceController(); diff --git a/package.json b/package.json index 3e7b4fed33..4e2bcee8b8 100644 --- a/package.json +++ b/package.json @@ -161,7 +161,7 @@ "@rspack/core": "1.5.6", "@rspack/dev-server": "1.1.4", "@types/babel__plugin-transform-runtime": "7.9.5", - "@types/chromecast-caf-receiver": "6.0.24", + "@types/chromecast-caf-receiver": "6.0.22", "@types/chromecast-caf-sender": "1.0.11", "@types/color-name": "2.0.0", "@types/culori": "4.0.1", diff --git a/yarn.lock b/yarn.lock index bdf0dce960..44559b6fd4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4491,10 +4491,10 @@ __metadata: languageName: node linkType: hard -"@types/chromecast-caf-receiver@npm:6.0.24": - version: 6.0.24 - resolution: "@types/chromecast-caf-receiver@npm:6.0.24" - checksum: 10/1f2b95e8a15dbb36d5328895229d4a5cb255b33e62d46335bd6ed75e16aa9ea6a7d765a64ae120d19b3134fb3e51e9547d2544c7277f7bffe0bf0b3999f026da +"@types/chromecast-caf-receiver@npm:6.0.22": + version: 6.0.22 + resolution: "@types/chromecast-caf-receiver@npm:6.0.22" + checksum: 10/6c51cb52527776ddfa187a261b88184c98bdd61c129dd8719cba213894d565cf69073734d6473696ffd60a768f6fb5a3fe9932693f43174fbc5e7af201db8a90 languageName: node linkType: hard @@ -9442,7 +9442,7 @@ __metadata: "@tsparticles/engine": "npm:3.9.1" "@tsparticles/preset-links": "npm:3.2.0" "@types/babel__plugin-transform-runtime": "npm:7.9.5" - "@types/chromecast-caf-receiver": "npm:6.0.24" + "@types/chromecast-caf-receiver": "npm:6.0.22" "@types/chromecast-caf-sender": "npm:1.0.11" "@types/color-name": "npm:2.0.0" "@types/culori": "npm:4.0.1"