import cors from 'cors'
import express from 'express'
import { OBJECT_STORAGE_PROXY_PATHS } from '@server/initializers/constants'
-import { getHLSFileReadStream, getWebTorrentFileReadStream } from '@server/lib/object-storage'
+import { proxifyHLS, proxifyWebTorrentFile } from '@server/lib/object-storage'
import {
asyncMiddleware,
ensureCanAccessPrivateVideoHLSFiles,
ensureCanAccessVideoPrivateWebTorrentFiles,
+ ensurePrivateObjectStorageProxyIsEnabled,
optionalAuthenticate
} from '@server/middlewares'
-import { HttpStatusCode } from '@shared/models'
+import { doReinjectVideoFileToken } from './shared/m3u8-playlist'
const objectStorageProxyRouter = express.Router()
objectStorageProxyRouter.use(cors())
objectStorageProxyRouter.get(OBJECT_STORAGE_PROXY_PATHS.PRIVATE_WEBSEED + ':filename',
+ ensurePrivateObjectStorageProxyIsEnabled,
optionalAuthenticate,
asyncMiddleware(ensureCanAccessVideoPrivateWebTorrentFiles),
- asyncMiddleware(proxifyWebTorrent)
+ asyncMiddleware(proxifyWebTorrentController)
)
objectStorageProxyRouter.get(OBJECT_STORAGE_PROXY_PATHS.STREAMING_PLAYLISTS.PRIVATE_HLS + ':videoUUID/:filename',
+ ensurePrivateObjectStorageProxyIsEnabled,
optionalAuthenticate,
asyncMiddleware(ensureCanAccessPrivateVideoHLSFiles),
- asyncMiddleware(proxifyHLS)
+ asyncMiddleware(proxifyHLSController)
)
// ---------------------------------------------------------------------------
objectStorageProxyRouter
}
-async function proxifyWebTorrent (req: express.Request, res: express.Response) {
+function proxifyWebTorrentController (req: express.Request, res: express.Response) {
const filename = req.params.filename
- try {
- const stream = await getWebTorrentFileReadStream({
- filename,
- rangeHeader: req.header('range')
- })
-
- return stream.pipe(res)
- } catch (err) {
- return handleObjectStorageFailure(res, err)
- }
+ return proxifyWebTorrentFile({ req, res, filename })
}
-async function proxifyHLS (req: express.Request, res: express.Response) {
+function proxifyHLSController (req: express.Request, res: express.Response) {
const playlist = res.locals.videoStreamingPlaylist
const video = res.locals.onlyVideo
const filename = req.params.filename
- try {
- const stream = await getHLSFileReadStream({
- playlist: playlist.withVideo(video),
- filename,
- rangeHeader: req.header('range')
- })
-
- return stream.pipe(res)
- } catch (err) {
- return handleObjectStorageFailure(res, err)
- }
-}
-
-function handleObjectStorageFailure (res: express.Response, err: Error) {
- if (err.name === 'NoSuchKey') {
- return res.sendStatus(HttpStatusCode.NOT_FOUND_404)
- }
+ const reinjectVideoFileToken = filename.endsWith('.m3u8') && doReinjectVideoFileToken(req)
- return res.fail({
- status: HttpStatusCode.INTERNAL_SERVER_ERROR_500,
- message: err.message,
- type: err.name
+ return proxifyHLS({
+ req,
+ res,
+ playlist,
+ video,
+ filename,
+ reinjectVideoFileToken
})
}