Prevent concurrency issues when sending m3u8 file

pull/5378/head
Chocobozzz 2022-10-21 14:42:31 +02:00 committed by Chocobozzz
parent 0177101284
commit b3ce36069f
2 changed files with 10 additions and 3 deletions

View File

@ -3,6 +3,7 @@ import { mapSeries } from 'bluebird'
import { FSWatcher, watch } from 'chokidar'
import { FfmpegCommand } from 'fluent-ffmpeg'
import { appendFile, ensureDir, readFile, stat } from 'fs-extra'
import PQueue from 'p-queue'
import { basename, join } from 'path'
import { EventEmitter } from 'stream'
import { getLiveMuxingCommand, getLiveTranscodingCommand } from '@server/helpers/ffmpeg'
@ -21,7 +22,6 @@ import { LiveSegmentShaStore } from '../live-segment-sha-store'
import { buildConcatenatedName } from '../live-utils'
import memoizee = require('memoizee')
interface MuxingSessionEvents {
'live-ready': (options: { videoId: number }) => void
@ -278,11 +278,18 @@ class MuxingSession extends EventEmitter {
private watchM3U8File () {
this.m3u8Watcher = watch(this.outDirectory + '/*.m3u8')
const sendQueues = new Map<string, PQueue>()
const onChangeOrAdd = async (m3u8Path: string) => {
if (this.streamingPlaylist.storage !== VideoStorage.OBJECT_STORAGE) return
try {
await storeHLSFileFromPath(this.streamingPlaylist, m3u8Path)
if (!sendQueues.has(m3u8Path)) {
sendQueues.set(m3u8Path, new PQueue({ concurrency: 1 }))
}
const queue = sendQueues.get(m3u8Path)
await queue.add(() => storeHLSFileFromPath(this.streamingPlaylist, m3u8Path))
} catch (err) {
logger.error('Cannot store in object storage m3u8 file %s', m3u8Path, { err, ...this.lTags() })
}

View File

@ -314,7 +314,7 @@ describe('Test syndication feeds', () => {
const jsonObj = JSON.parse(json)
const imageUrl = jsonObj.icon
expect(imageUrl).to.include('/lazy-static/avatars/')
await makeRawRequest({ url: imageUrl })
await makeRawRequest({ url: imageUrl, expectedStatus: HttpStatusCode.OK_200 })
})
})