Add: handle suspended session cast

Author: sawyerf

app/contexts/remote/provider.native.js

@@ -68,6 +68,8 @@ export const RemoteProvider = ({ children }) => {
 						logger.error('RemoteProvider', 'Error transferring playback (same type):', error)
 						prevSelectedDeviceRef.current = null
 						setStatus(STATUS.Connected)
+						Player.switchPlayer('local')
+						Player.playSong(config, songDispatch, song.queue, song.index)
 						setSelectedDevice(null)
 					})
 			} else {
@@ -77,7 +79,9 @@ export const RemoteProvider = ({ children }) => {
 						logger.error('RemoteProvider', 'Error transferring playback:', error)
 						prevSelectedDeviceRef.current = null
 						setStatus(STATUS.Connected)
-						setSelectedDevice(prevDevice)
+						Player.switchPlayer('local')
+						Player.playSong(config, songDispatch, song.queue, song.index)
+						setSelectedDevice(null)
 					})
 			}
 		}

app/utils/player/playerCast.native.js

@@ -22,19 +22,23 @@ const useEvent = (_song, songDispatch, nextSong) => {
 	const client = useRemoteMediaClient()
 	const remote = useRemote()
 
+	React.useEffect(() => {
+		if (!client) return
+		const sessionManager = GoogleCast.getSessionManager()
+		const event = sessionManager.onSessionSuspended(() => {
+			logger.info('RemotePlayer', 'Session suspended')
+			remote.selectDevice(null)
+		})
+		return () => event.remove()
+	}, [client, remote])
+
 	React.useEffect(() => {
 		const events = []
 		if (!client) return
 		const sessionManager = GoogleCast.getSessionManager()
 
 		events.push(sessionManager.onSessionEnded(() => {
 			logger.info('RemotePlayer', 'Session ended')
-			remote.selectDevice(null)
-		}))
-
-		events.push(sessionManager.onSessionSuspended(() => {
-			logger.info('RemotePlayer', 'Session suspended')
-			songDispatch({ type: 'setPlaying', state: State.Stopped })
 		}))
 
 		events.push(client.onMediaStatusUpdated((mediaStatus) => {
@@ -192,7 +196,7 @@ const connectAndWait = (deviceId) => {
 		const timeoutId = setTimeout(() => {
 			events.forEach((event) => event.remove())
 			reject(new Error('Connection to device timed out'))
-		}, 60 * 1000)
+		}, 30 * 1000)
 		events.push(sessionManager.onSessionStarted(() => {
 			clearTimeout(timeoutId)
 			events.forEach((event) => event.remove())

app/utils/remote/upnp.native.js

@@ -235,7 +235,6 @@ const STATE_VALUES = {
 }
 
 const convertState = (upnpState) => {
-	console.log('UPNP State:', upnpState)
 	return STATE_VALUES[upnpState] || State.Stopped
 }