From c9aaff76b3cdd5737727bd8fe8b6b32ddcb827ea Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Thu, 5 Nov 2026 09:19:48 +0000 Subject: [PATCH] fix: resume audio retry from the failed position instead of 0:00 (#22986) ## Summary Retrying audio after a failure partway through playback now resumes where it stopped instead of restarting at 0:00. ## Changes - **What**: `AudioPreviewPlayer` and `useWaveAudioPlayer` reload a failed source before retrying (needed, since `play()` keeps failing until `load()` runs). `load()` resets the position to 0. The new `reloadFailedMedia` helper remembers the position, reloads, and seeks back once the reloaded file's metadata arrives. It only seeks back if the element still has the same source, so a replaced file always starts at 0:00. - Also pins `level: 'warning'` on the post-start failure report assertion (open review thread on #22390). ## Review Focus - Known limit left by #22390 / #22609 ("a retry after a mid-playback failure restarts at 0:00"), now fixed. - Test-first: the first commit adds the tests and fails on CI; the second commit adds the fix. Follow-up to #22390 and #22451. --- src/composables/useWaveAudioPlayer.test.ts | 24 +++++++ src/composables/useWaveAudioPlayer.ts | 3 +- .../audio/AudioPreviewPlayer.test.ts | 68 ++++++++++++++++++- .../components/audio/AudioPreviewPlayer.vue | 3 +- src/utils/mediaReloadUtil.test.ts | 62 +++++++++++++++++ src/utils/mediaReloadUtil.ts | 19 ++++++ 6 files changed, 176 insertions(+), 3 deletions(-) create mode 100644 src/utils/mediaReloadUtil.test.ts create mode 100644 src/utils/mediaReloadUtil.ts diff --git a/src/composables/useWaveAudioPlayer.test.ts b/src/composables/useWaveAudioPlayer.test.ts index a2889a6e729..fc417154a66 100644 --- a/src/composables/useWaveAudioPlayer.test.ts +++ b/src/composables/useWaveAudioPlayer.test.ts @@ -327,6 +327,30 @@ describe('useWaveAudioPlayer', () => { expect(useToast().toasts).toEqual([]) }) + it('resumes a retry from where a mid-playback failure stopped', async () => { + const { audio, player } = await createPlayer() + let position = 42 + let mediaError: { code: number } | null = { code: 2 } + Object.defineProperty(audio, 'error', { get: () => mediaError }) + Object.defineProperty(audio, 'currentTime', { + get: () => position, + set: (value: number) => { + position = value + } + }) + vi.spyOn(audio, 'load').mockImplementation(() => { + mediaError = null + position = 0 + }) + vi.spyOn(audio, 'play').mockResolvedValue(undefined) + + player.togglePlayPause() + await vi.waitFor(() => expect(audio.load).toHaveBeenCalledTimes(1)) + audio.dispatchEvent(new Event('loadedmetadata')) + + expect(position).toBe(42) + }) + it('reports failures on the caller surface', async () => { vi.mocked(useMediaControls).mockReset() const player = useWaveAudioPlayer({ diff --git a/src/composables/useWaveAudioPlayer.ts b/src/composables/useWaveAudioPlayer.ts index 923be10d09b..911b9d83dc2 100644 --- a/src/composables/useWaveAudioPlayer.ts +++ b/src/composables/useWaveAudioPlayer.ts @@ -9,6 +9,7 @@ import type { Surface } from '@/platform/telemetry/reportError' import { api } from '@/scripts/api' import { createToastId } from '@/types/toastId' import { formatTime } from '@/utils/formatUtil' +import { reloadFailedMedia } from '@/utils/mediaReloadUtil' interface WaveformBar { height: number @@ -142,7 +143,7 @@ export function useWaveAudioPlayer(options: UseWaveAudioPlayerOptions) { const attempt = ++playAttempt try { - if (audio.error) audio.load() + if (audio.error) reloadFailedMedia(audio) await audio.play() if (attempt === playAttempt) toast.dismiss(playbackErrorToastId) } catch (error) { diff --git a/src/renderer/extensions/vueNodes/widgets/components/audio/AudioPreviewPlayer.test.ts b/src/renderer/extensions/vueNodes/widgets/components/audio/AudioPreviewPlayer.test.ts index 7ebaa36518b..c1ac6045dae 100644 --- a/src/renderer/extensions/vueNodes/widgets/components/audio/AudioPreviewPlayer.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/components/audio/AudioPreviewPlayer.test.ts @@ -130,6 +130,69 @@ describe('AudioPreviewPlayer', () => { ) }) + it('resumes a retry from where a mid-playback failure stopped', async () => { + vi.spyOn(HTMLMediaElement.prototype, 'play').mockResolvedValue(undefined) + let position = 42 + let mediaError: MediaError | null = fromPartial({ code: 2 }) + vi.spyOn(HTMLMediaElement.prototype, 'error', 'get').mockImplementation( + () => mediaError + ) + vi.spyOn( + HTMLMediaElement.prototype, + 'currentTime', + 'get' + ).mockImplementation(() => position) + vi.spyOn( + HTMLMediaElement.prototype, + 'currentTime', + 'set' + ).mockImplementation((value: number) => { + position = value + }) + vi.spyOn(HTMLMediaElement.prototype, 'load').mockImplementation(() => { + mediaError = null + position = 0 + }) + const user = userEvent.setup() + + renderPlayer('http://example.com/audio.mp3') + await user.click(screen.getByRole('button', { name: 'g.playPause' })) + await fireEvent.loadedMetadata(screen.getByTestId('audio-preview')) + + expect(position).toBe(42) + }) + + it('does not carry a retry position over to a replaced source', async () => { + vi.spyOn(HTMLMediaElement.prototype, 'play').mockResolvedValue(undefined) + let position = 42 + let mediaError: MediaError | null = fromPartial({ code: 2 }) + vi.spyOn(HTMLMediaElement.prototype, 'error', 'get').mockImplementation( + () => mediaError + ) + vi.spyOn( + HTMLMediaElement.prototype, + 'currentTime', + 'get' + ).mockImplementation(() => position) + const seek = vi + .spyOn(HTMLMediaElement.prototype, 'currentTime', 'set') + .mockImplementation((value: number) => { + position = value + }) + vi.spyOn(HTMLMediaElement.prototype, 'load').mockImplementation(() => { + mediaError = null + position = 0 + }) + const user = userEvent.setup() + + const { rerender } = renderPlayer('http://example.com/a.mp3') + await user.click(screen.getByRole('button', { name: 'g.playPause' })) + await rerender({ modelValue: 'http://example.com/b.mp3' }) + await fireEvent.loadedMetadata(screen.getByTestId('audio-preview')) + + expect(seek).not.toHaveBeenCalledWith(42) + }) + it('follows a pause that came from outside the player', async () => { vi.spyOn(HTMLMediaElement.prototype, 'play').mockResolvedValue(undefined) vi.spyOn(HTMLMediaElement.prototype, 'paused', 'get').mockReturnValue( @@ -217,7 +280,10 @@ describe('AudioPreviewPlayer', () => { message: 'Audio playback failed (MediaError 4): DEMUXER_ERROR_COULD_NOT_OPEN' }), - expect.objectContaining({ errorType: 'error_playing_audio' }) + expect.objectContaining({ + errorType: 'error_playing_audio', + level: 'warning' + }) ) }) diff --git a/src/renderer/extensions/vueNodes/widgets/components/audio/AudioPreviewPlayer.vue b/src/renderer/extensions/vueNodes/widgets/components/audio/AudioPreviewPlayer.vue index 6dd898c7be6..dca71bbbc8a 100644 --- a/src/renderer/extensions/vueNodes/widgets/components/audio/AudioPreviewPlayer.vue +++ b/src/renderer/extensions/vueNodes/widgets/components/audio/AudioPreviewPlayer.vue @@ -146,6 +146,7 @@ import MenuItemContent from '@/components/ui/menu/MenuItemContent.vue' import Slider from '@/components/ui/slider/Slider.vue' import { formatTime } from '@/utils/formatUtil' +import { reloadFailedMedia } from '@/utils/mediaReloadUtil' const { t } = useI18n() const toast = useToast() @@ -199,7 +200,7 @@ const togglePlayPause = async () => { isPlaying.value = true try { - if (audio.error) audio.load() + if (audio.error) reloadFailedMedia(audio) await audio.play() if (attempt === playAttempt) toast.dismiss(playbackErrorToastId) } catch (error) { diff --git a/src/utils/mediaReloadUtil.test.ts b/src/utils/mediaReloadUtil.test.ts new file mode 100644 index 00000000000..8c8fefe0689 --- /dev/null +++ b/src/utils/mediaReloadUtil.test.ts @@ -0,0 +1,62 @@ +import { describe, expect, it, vi } from 'vitest' + +import { reloadFailedMedia } from '@/utils/mediaReloadUtil' + +function failedAt(position: number) { + const media = document.createElement('audio') + media.src = 'http://example.com/a.mp3' + let current = position + Object.defineProperty(media, 'currentTime', { + get: () => current, + set: (value: number) => { + current = value + } + }) + vi.spyOn(media, 'load').mockImplementation(() => { + current = 0 + }) + return { media, position: () => current } +} + +describe('reloadFailedMedia', () => { + it('reloads and seeks back to the failed position once metadata loads', () => { + const { media, position } = failedAt(42) + + reloadFailedMedia(media) + expect(media.load).toHaveBeenCalledTimes(1) + expect(position()).toBe(0) + media.dispatchEvent(new Event('loadedmetadata')) + + expect(position()).toBe(42) + }) + + it('does not seek a replaced source', () => { + const { media, position } = failedAt(42) + + reloadFailedMedia(media) + media.src = 'http://example.com/b.mp3' + media.dispatchEvent(new Event('loadedmetadata')) + + expect(position()).toBe(0) + }) + + it('keeps a position the user chose before metadata loaded', () => { + const { media, position } = failedAt(42) + + reloadFailedMedia(media) + media.currentTime = 10 + media.dispatchEvent(new Event('loadedmetadata')) + + expect(position()).toBe(10) + }) + + it('keeps a seek the user started before metadata loaded', () => { + const { media, position } = failedAt(42) + + reloadFailedMedia(media) + media.dispatchEvent(new Event('seeking')) + media.dispatchEvent(new Event('loadedmetadata')) + + expect(position()).toBe(0) + }) +}) diff --git a/src/utils/mediaReloadUtil.ts b/src/utils/mediaReloadUtil.ts new file mode 100644 index 00000000000..c7c4c4465fd --- /dev/null +++ b/src/utils/mediaReloadUtil.ts @@ -0,0 +1,19 @@ +export function reloadFailedMedia(media: HTMLMediaElement) { + const resumeAt = media.currentTime + const src = media.src + media.load() + if (!(resumeAt > 0)) return + + const controller = new AbortController() + const { signal } = controller + media.addEventListener('seeking', () => controller.abort(), { signal }) + media.addEventListener( + 'loadedmetadata', + () => { + controller.abort() + if (media.src === src && media.currentTime === 0) + media.currentTime = resumeAt + }, + { signal } + ) +}