X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fstatic.ts;h=0b5c12b7603cf540afa19d04de7509befbf40431;hb=1cc9774668827c1255e4cd0775cb781c7f73051c;hp=139ba67cc290b09db1c9867911f14f43669ee04b;hpb=9118bca30759a2cc2584cde0bbca13466af735fb;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index 139ba67cc..0b5c12b76 100644
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -1,66 +1,41 @@
-import * as cors from 'cors'
-import * as express from 'express'
-import { CONFIG, STATIC_DOWNLOAD_PATHS, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers'
-import { VideosPreviewCache } from '../lib/cache'
-import { asyncMiddleware, videosGetValidator } from '../middlewares'
-import { VideoModel } from '../models/video/video'
+import { HttpStatusCode } from '@shared/models'
+import cors from 'cors'
+import express from 'express'
+import { CONFIG } from '../initializers/config'
+import { HLS_STREAMING_PLAYLIST_DIRECTORY, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers/constants'
 
 const staticRouter = express.Router()
 
-/*
-  Cors is very important to let other servers access torrent and video files
-*/
+// Cors is very important to let other servers access torrent and video files
+staticRouter.use(cors())
 
-const torrentsPhysicalPath = CONFIG.STORAGE.TORRENTS_DIR
+// Videos path for webseed
 staticRouter.use(
-  STATIC_PATHS.TORRENTS,
-  cors(),
-  express.static(torrentsPhysicalPath, { maxAge: 0 }) // Don't cache because we could regenerate the torrent file
+  STATIC_PATHS.WEBSEED,
+  express.static(CONFIG.STORAGE.VIDEOS_DIR, { fallthrough: false }),
+  handleStaticError
 )
 staticRouter.use(
-  STATIC_DOWNLOAD_PATHS.TORRENTS + ':id-:resolution([0-9]+).torrent',
-  asyncMiddleware(videosGetValidator),
-  asyncMiddleware(downloadTorrent)
+  STATIC_PATHS.REDUNDANCY,
+  express.static(CONFIG.STORAGE.REDUNDANCY_DIR, { fallthrough: false }),
+  handleStaticError
 )
 
-// Videos path for webseeding
-const videosPhysicalPath = CONFIG.STORAGE.VIDEOS_DIR
+// HLS
 staticRouter.use(
-  STATIC_PATHS.WEBSEED,
-  cors(),
-  express.static(videosPhysicalPath, { maxAge: STATIC_MAX_AGE })
-)
-staticRouter.use(
-  STATIC_DOWNLOAD_PATHS.VIDEOS + ':id-:resolution([0-9]+).:extension',
-  asyncMiddleware(videosGetValidator),
-  asyncMiddleware(downloadVideoFile)
+  STATIC_PATHS.STREAMING_PLAYLISTS.HLS,
+  express.static(HLS_STREAMING_PLAYLIST_DIRECTORY, { fallthrough: false }),
+  handleStaticError
 )
 
 // Thumbnails path for express
 const thumbnailsPhysicalPath = CONFIG.STORAGE.THUMBNAILS_DIR
 staticRouter.use(
   STATIC_PATHS.THUMBNAILS,
-  express.static(thumbnailsPhysicalPath, { maxAge: STATIC_MAX_AGE })
-)
-
-const avatarsPhysicalPath = CONFIG.STORAGE.AVATARS_DIR
-staticRouter.use(
-  STATIC_PATHS.AVATARS,
-  express.static(avatarsPhysicalPath, { maxAge: STATIC_MAX_AGE })
-)
-
-// Video previews path for express
-staticRouter.use(
-  STATIC_PATHS.PREVIEWS + ':uuid.jpg',
-  asyncMiddleware(getPreview)
+  express.static(thumbnailsPhysicalPath, { maxAge: STATIC_MAX_AGE.SERVER, fallthrough: false }),
+  handleStaticError
 )
 
-// robots.txt service
-staticRouter.get('/robots.txt', (req: express.Request, res: express.Response) => {
-  res.type('text/plain')
-  return res.send(CONFIG.INSTANCE.ROBOTS)
-})
-
 // ---------------------------------------------------------------------------
 
 export {
@@ -69,32 +44,16 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function getPreview (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const path = await VideosPreviewCache.Instance.getPreviewPath(req.params.uuid)
-  if (!path) return res.sendStatus(404)
-
-  return res.sendFile(path, { maxAge: STATIC_MAX_AGE })
-}
-
-async function downloadTorrent (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const { video, videoFile } = getVideoAndFile(req, res)
-  if (!videoFile) return res.status(404).end()
-
-  return res.download(video.getTorrentFilePath(videoFile), `${video.name}-${videoFile.resolution}p.torrent`)
-}
-
-async function downloadVideoFile (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const { video, videoFile } = getVideoAndFile(req, res)
-  if (!videoFile) return res.status(404).end()
-
-  return res.download(video.getVideoFilePath(videoFile), `${video.name}-${videoFile.resolution}p${videoFile.extname}`)
-}
-
-function getVideoAndFile (req: express.Request, res: express.Response) {
-  const resolution = parseInt(req.params.resolution, 10)
-  const video: VideoModel = res.locals.video
+function handleStaticError (err: any, req: express.Request, res: express.Response, next: express.NextFunction) {
+  const message = err.message || ''
 
-  const videoFile = video.VideoFiles.find(f => f.resolution === resolution)
+  if (message.includes('ENOENT')) {
+    return res.fail({
+      status: err.status || HttpStatusCode.INTERNAL_SERVER_ERROR_500,
+      message: err.message,
+      type: err.name
+    })
+  }
 
-  return { video, videoFile }
+  return next(err)
 }