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

diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index ccae60517..0b5c12b76 100644
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -1,41 +1,39 @@
-import * as cors from 'cors'
-import * as express from 'express'
-import { CONFIG, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers'
-import { VideosPreviewCache } from '../lib/cache'
-import { asyncMiddleware } from '../middlewares'
+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_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 })
+  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 })
-)
-
-// 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
 )
 
 // ---------------------------------------------------------------------------
@@ -46,9 +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)
+function handleStaticError (err: any, req: express.Request, res: express.Response, next: express.NextFunction) {
+  const message = err.message || ''
+
+  if (message.includes('ENOENT')) {
+    return res.fail({
+      status: err.status || HttpStatusCode.INTERNAL_SERVER_ERROR_500,
+      message: err.message,
+      type: err.name
+    })
+  }
 
-  return res.sendFile(path, { maxAge: STATIC_MAX_AGE })
+  return next(err)
 }