groove/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2026-05-13 06:51:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge f86258cd13 into 47ea6b5092

Browse source
This commit is contained in:
Finn Dittmar 2026-05-06 00:23:35 +02:00 • committed by GitHub
commit 6301995ed3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 81 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

37
server/utils/ffmpegHelpers.js
View file

@ -106,6 +106,8 @@ module.exports.resizeImage = resizeImage
*/
module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
return new Promise(async (resolve) => {
const FFMPEG_PROGRESS_STALL_TIMEOUT_MS = 60000
// Some podcasts fail due to user agent strings
// See: https://github.com/advplyr/audiobookshelf/issues/3246 (requires iTMS user agent)
// See: https://github.com/advplyr/audiobookshelf/issues/4401 (requires no iTMS user agent)
@ -195,6 +197,31 @@ module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
ffmpeg.addOutput(podcastEpisodeDownload.targetPath)
let ffmpegProgressWatchdog = null
let lastFfmpegProgressAt = 0
let killedForNoProgress = false
const clearProgressWatchdog = () => {
if (ffmpegProgressWatchdog) {
clearTimeout(ffmpegProgressWatchdog)
ffmpegProgressWatchdog = null
}
}
const scheduleProgressWatchdog = () => {
clearProgressWatchdog()
ffmpegProgressWatchdog = setTimeout(() => {
const timeSinceLastProgressMs = Date.now() - lastFfmpegProgressAt
if (timeSinceLastProgressMs < FFMPEG_PROGRESS_STALL_TIMEOUT_MS) {
return
}
killedForNoProgress = true
Logger.error(`[FfmpegHelpers] downloadPodcastEpisode: No ffmpeg progress for ${timeSinceLastProgressMs}ms, stopping download for "${podcastEpisodeDownload.url}"`)
ffmpeg.kill('SIGKILL')
}, FFMPEG_PROGRESS_STALL_TIMEOUT_MS)
}
const stderrLines = []
ffmpeg.on('stderr', (stderrLine) => {
if (typeof stderrLine === 'string') {
@ -203,8 +230,14 @@ module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
})
ffmpeg.on('start', (cmd) => {
Logger.debug(`[FfmpegHelpers] downloadPodcastEpisode: Cmd: ${cmd}`)
lastFfmpegProgressAt = Date.now()
scheduleProgressWatchdog()
})
ffmpeg.on('error', (err) => {
clearProgressWatchdog()
if (killedForNoProgress) {
Logger.error(`[FfmpegHelpers] downloadPodcastEpisode: Killed after stalled progress for "${podcastEpisodeDownload.url}"`)
}
Logger.error(`[FfmpegHelpers] downloadPodcastEpisode: Error ${err}`)
if (stderrLines.length) {
Logger.error(`Full stderr dump for episode url "${podcastEpisodeDownload.url}": ${stderrLines.join('\n')}`)
@ -214,6 +247,9 @@ module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
})
})
ffmpeg.on('progress', (progress) => {
lastFfmpegProgressAt = Date.now()
scheduleProgressWatchdog()
let progressPercent = 0
if (finalSizeInBytes && progress.targetSize && !isNaN(progress.targetSize)) {
const finalSizeInKb = Math.floor(finalSizeInBytes / 1000)
@ -222,6 +258,7 @@ module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
Logger.debug(`[FfmpegHelpers] downloadPodcastEpisode: Progress estimate ${progressPercent.toFixed(0)}% (${progress?.targetSize || 'N/A'} KB) for "${podcastEpisodeDownload.url}"`)
})
ffmpeg.on('end', () => {
clearProgressWatchdog()
Logger.debug(`[FfmpegHelpers] downloadPodcastEpisode: Complete`)
resolve({
success: true