Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 50 additions & 5 deletions src/composables/useWaveAudioPlayer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -310,14 +310,59 @@ describe('useWaveAudioPlayer', () => {

it('reloads a failed source before retrying', async () => {
const { audio, player } = await createPlayer()
Object.defineProperty(audio, 'error', { value: { code: 4 } })
const load = vi.spyOn(audio, 'load').mockImplementation(() => {})
const play = vi.spyOn(audio, 'play').mockResolvedValue(undefined)
let mediaError: { code: number } | null = { code: 4 }
Object.defineProperty(audio, 'error', { get: () => mediaError })
const load = vi.spyOn(audio, 'load').mockImplementation(() => {
mediaError = null
})
vi.spyOn(audio, 'play').mockImplementation(() =>
mediaError ? Promise.reject(notSupported()) : Promise.resolve()
)

player.togglePlayPause()
await vi.waitFor(() => expect(play).toHaveBeenCalledTimes(1))
await vi.waitFor(() => expect(load).toHaveBeenCalledTimes(1))
await nextTick()
await nextTick()

expect(useToast().toasts).toEqual([])
})

it('reports failures on the caller surface', async () => {
vi.mocked(useMediaControls).mockReset()
const player = useWaveAudioPlayer({
src: ref(''),
surface: 'agent',
waveform: false
})
const audio = document.createElement('audio')
player.audioRef.value = audio
await nextTick()
vi.spyOn(audio, 'play').mockRejectedValue(notSupported())

player.togglePlayPause()

await vi.waitFor(() =>
expect(reportError).toHaveBeenCalledWith(
expect.any(DOMException),
expect.objectContaining({ surface: 'agent' })
)
)
})

it('resumes from a waveform click right after a pause', async () => {
const { audio, player } = await createPlayer()
const play = vi.spyOn(audio, 'play').mockResolvedValue(undefined)
const waveform = document.createElement('div')
waveform.getBoundingClientRect = () => new DOMRect(0, 0, 100, 10)
player.waveformRef.value = waveform
await giveDuration(audio)
audio.dispatchEvent(new Event('play'))
await nextTick()
expect(player.isPlaying.value).toBe(true)

player.handleWaveformClick(new MouseEvent('click'))

expect(load).toHaveBeenCalledTimes(1)
expect(play).toHaveBeenCalledTimes(1)
})

it('stays silent when a play attempt is aborted', async () => {
Expand Down
12 changes: 10 additions & 2 deletions src/composables/useWaveAudioPlayer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import type { Ref } from 'vue'
import { useToast } from '@/components/ui/toast/toastStore'
import { t } from '@/i18n'
import { reportError } from '@/platform/telemetry/reportError'
import type { Surface } from '@/platform/telemetry/reportError'
import { api } from '@/scripts/api'
import { createToastId } from '@/types/toastId'
import { formatTime } from '@/utils/formatUtil'
Expand All @@ -16,12 +17,19 @@ interface WaveformBar {
interface UseWaveAudioPlayerOptions {
src: Readonly<Ref<string | undefined>>
logicalSrc?: Readonly<Ref<string | undefined>>
surface?: Surface
barCount?: number
waveform?: boolean
}

export function useWaveAudioPlayer(options: UseWaveAudioPlayerOptions) {
const { src, logicalSrc = src, barCount = 40, waveform = true } = options
const {
src,
logicalSrc = src,
surface = 'assets',
barCount = 40,
waveform = true
} = options

const audioRef = ref<HTMLAudioElement>()
const waveformRef = ref<HTMLElement>()
Expand Down Expand Up @@ -147,7 +155,7 @@ export function useWaveAudioPlayer(options: UseWaveAudioPlayerOptions) {
}
reportError(error, {
errorType: 'error_playing_audio',
surface: 'assets',
surface,
level: 'warning'
})
toast.error(t('g.error'), {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ const {
volumeIcon,
toggleMute,
seekToRatio
} = useWaveAudioPlayer({ src: toRef(() => asset.url), waveform: false })
} = useWaveAudioPlayer({
src: toRef(() => asset.url),
surface: 'agent',
waveform: false
})

function onScrub(value: number[] | undefined): void {
if (value?.length) seekToRatio(value[0] / 100)
Expand Down
Loading