Fix: tutuktuk

Author: sawyerf

app/contexts/remote/provider.native.js

@@ -25,7 +25,6 @@ const transfer = async (fromDevice, toDevice, config, song, songDispatch) => {
 const transferSameType = async (fromDevice, toDevice, config, song, songDispatch) => {
 	// Save state from previous player
 	const savedState = await Player.saveState()
-	await Player.stopSong()
 	await Player.disconnect(fromDevice)
 
 	// Connect to new player

app/services/servicePlayback.js

@@ -52,40 +52,37 @@ module.exports = async () => {
 	})
 	TrackPlayer.addEventListener(Event.PlaybackQueueEnded, (_event) => {
 		if (!global.song?.queue?.length) return
+		if (global.song?.songInfo?.id === 'tuktuktuk') return Player.resetAudio(global.songDispatch)
 		getApi(global.config, 'scrobble', { id: global.song.songInfo.id, submission: true })
 			.catch(() => { })
 		if (global.song.actionEndOfSong === 'repeat') {
-			TrackPlayer.seekTo(0)
-			TrackPlayer.play()
+			Player.setPosition(0)
+			Player.resumeSong()
 		} else if (!global.repeatQueue && global.song.index === global.song.queue.length - 1) {
-			TrackPlayer.stop()
+			Player.stopSong()
 		} else Player.nextSong(global.config, global.song, fakeSongDispatch)
 	})
 	TrackPlayer.addEventListener(Event.PlaybackActiveTrackChanged, async (event) => {
-		if (event.track?.id === 'tuktuktukend') {
-			await TrackPlayer.remove([0, 1])
-		} else {
-			if (!lockDownload) {
-				lockDownload = true
-				downloadNextSong(global.song.queue, global.song.index)
-					.then(() => {
-						lockDownload = false
-					})
-					.catch((error) => {
-						lockDownload = false
-						logger.error('downloadNextSong', error)
-					})
-			}
+		if (!lockDownload) {
+			lockDownload = true
+			downloadNextSong(global.song.queue, global.song.index)
+				.then(() => {
+					lockDownload = false
+				})
+				.catch((error) => {
+					lockDownload = false
+					logger.error('downloadNextSong', error)
+				})
+		}
 
-			if (event.track) {
-				const now = Date.now()
-				if (lastScrobble.id !== event.track.id || now - lastScrobble.time > 10 * 1000) {
-					getApi(global.config, 'scrobble', { id: event.track.id, submission: false })
-						.catch(() => { })
-					lastScrobble = {
-						id: event.track.id,
-						time: now,
-					}
+		if (event.track) {
+			const now = Date.now()
+			if (lastScrobble.id !== event.track.id || now - lastScrobble.time > 10 * 1000) {
+				getApi(global.config, 'scrobble', { id: event.track.id, submission: false })
+					.catch(() => { })
+				lastScrobble = {
+					id: event.track.id,
+					time: now,
 				}
 			}
 		}

app/utils/player/playerCast.native.js

@@ -227,6 +227,7 @@ const connect = async (device) => {
 }
 
 const disconnect = async (_device) => {
+	await stopSong()
 	const sessionManager = GoogleCast.getSessionManager()
 	await sessionManager.endCurrentSession(true)
 }

app/utils/player/playerLocal.native.js

@@ -24,6 +24,7 @@ const convertState = (state) => {
 }
 
 const initPlayer = async (songDispatch) => {
+	global.songDispatch = songDispatch
 	const song = await AsyncStorage.getItem('song')
 		.then((song) => song ? JSON.parse(song) : null)
 	try {
@@ -202,7 +203,7 @@ const tuktuktuk = async (songDispatch) => {
 	const urlTuk = 'https://sawyerf.github.io/tuktuktuk.mp3'
 	const playingState = await TrackPlayer.getPlaybackState()
 
-	if ([State.Paused, State.Ended, State.Stopped, State.None].indexOf(playingState.state) > -1) {
+	if ([State.Paused, State.Ended, State.Stopped, State.None, State.Error].indexOf(playingState.state) > -1) {
 		const queue = [{
 			id: 'tuktuktuk',
 			albumId: 'tuktuktuk',
@@ -211,19 +212,10 @@ const tuktuktuk = async (songDispatch) => {
 			album: 'Tuk Tuk Tuk',
 			artist: 'Sawyerf',
 			artwork: require('~/../assets/icon.png')
-		},
-		{
-			id: 'tuktuktukend',
-			albumId: 'tuktuktuk',
-			url: urlTuk,
-			title: 'Tuk Tuk Tuk',
-			artist: 'Sawyerf',
-			artwork: require('~/../assets/foreground-icon.png')
 		}]
-		await TrackPlayer.setQueue(queue)
-		await TrackPlayer.play()
 		songDispatch({ type: 'setQueue', queue, index: 0 })
 		songDispatch({ type: 'setActionEndOfSong', action: 'next' })
+		await loadSong(global.config, queue, 0)
 	}
 }
 
@@ -255,6 +247,7 @@ const connect = async (_device) => {
 }
 
 const disconnect = async (_device) => {
+	await stopSong()
 	isConnected = false
 }
 

app/utils/url.js

@@ -13,11 +13,11 @@ const realCover = (config, id, size = null) => {
 
 export const urlCover = (config, id, size = null) => {
 	if (!id) return null
-	if (id === 'tuktuktuk') return 'https://github.com/sawyerf/Castafiore/blob/main/assets/icon.png?raw=true'
 	if (!config?.url || !config?.query) return null
 	if (typeof id === 'object') {
 		const item = id
 
+		if (item.id === 'tuktuktuk') return 'https://github.com/sawyerf/Castafiore/blob/main/assets/icon.png?raw=true'
 		if (item.homePageUrl && item.homePageUrl.startsWith('http')) {
 			return item.homePageUrl + '/favicon.ico'
 		}
@@ -38,6 +38,7 @@ export const urlCover = (config, id, size = null) => {
 }
 
 export const urlStream = (config, id, format = 'raw', maxBitRate = 0) => {
+	if (id === 'tuktuktuk') return 'https://sawyerf.github.io/tuktuktuk.mp3' 
 	if (!id.match(/^[a-zA-Z0-9-]*$/)) return id
 	if (format === 'raw') return getUrl(config, 'stream', { id })
 	return getUrl(config, 'stream', { id, format, maxBitRate })