Merge branch 'feature/otp' into develop

[github/Chocobozzz/PeerTube.git] / server / controllers / static.ts

diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index e65282339e9f2143484cbd6ad483be457166e00a..33c429eb17a235a1fed1adb52aa326bcbc3b992a 100644 (file)
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -1,45 +1,39 @@
-import * as express from 'express'
-import * as cors from 'cors'
-
-import {
-  CONFIG,
-  STATIC_MAX_AGE,
-  STATIC_PATHS
-} from '../initializers'
+import cors from 'cors'
+import express from 'express'
+import { handleStaticError } from '@server/middlewares'
+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 pods 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.WEBSEED,
+  express.static(CONFIG.STORAGE.VIDEOS_DIR, { fallthrough: false }),
+  handleStaticError
+)
 staticRouter.use(
-  STATIC_PATHS.TORRENTS,
-  cors(),
-  express.static(torrentsPhysicalPath, { maxAge: STATIC_MAX_AGE })
+  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
-const previewsPhysicalPath = CONFIG.STORAGE.PREVIEWS_DIR
-staticRouter.use(
-  STATIC_PATHS.PREVIEWS,
-  express.static(previewsPhysicalPath, { maxAge: STATIC_MAX_AGE })
+  express.static(thumbnailsPhysicalPath, { maxAge: STATIC_MAX_AGE.SERVER, fallthrough: false }),
+  handleStaticError
 )
 
 // ---------------------------------------------------------------------------