Server: move static/client routes in controllers/

[github/Chocobozzz/PeerTube.git] / server.js

diff --git a/server.js b/server.js
index 65cf69f7db034f9a5b71e3f1440258afea031049..6eb0220004b3a2f5238c3ae0333282415752162a 100644 (file)
--- a/server.js
+++ b/server.js
@@ -2,7 +2,6 @@
 
 // ----------- Node modules -----------
 const bodyParser = require('body-parser')
-const cors = require('cors')
 const express = require('express')
 const expressValidator = require('express-validator')
 const http = require('http')
@@ -66,34 +65,19 @@ app.use(expressValidator({
 
 // ----------- Views, routes and static files -----------
 
-// API routes
+// API
 const apiRoute = '/api/' + constants.API_VERSION
 app.use(apiRoute, routes.api)
 
-// Static files
-app.use('/client', express.static(path.join(__dirname, '/client/dist'), { maxAge: constants.STATIC_MAX_AGE }))
-// 404 for static files not found
-app.use('/client/*', function (req, res, next) {
-  res.sendStatus(404)
-})
-
-const torrentsPhysicalPath = constants.CONFIG.STORAGE.TORRENTS_DIR
-app.use(constants.STATIC_PATHS.TORRENTS, cors(), express.static(torrentsPhysicalPath, { maxAge: constants.STATIC_MAX_AGE }))
-
-// Videos path for webseeding
-const videosPhysicalPath = constants.CONFIG.STORAGE.VIDEOS_DIR
-app.use(constants.STATIC_PATHS.WEBSEED, cors(), express.static(videosPhysicalPath, { maxAge: constants.STATIC_MAX_AGE }))
+// Client files
+app.use('/', routes.client)
 
-// Thumbnails path for express
-const thumbnailsPhysicalPath = constants.CONFIG.STORAGE.THUMBNAILS_DIR
-app.use(constants.STATIC_PATHS.THUMBNAILS, express.static(thumbnailsPhysicalPath, { maxAge: constants.STATIC_MAX_AGE }))
+// Static files
+app.use('/', routes.static)
 
-// Client application
-app.use('/videos/embed', function (req, res, next) {
-  res.sendFile(path.join(__dirname, 'client/dist/standalone/videos/embed.html'))
-})
+// Always serve index client page (the client is a single page application, let it handle routing)
 app.use('/*', function (req, res, next) {
-  res.sendFile(path.join(__dirname, 'client/dist/index.html'))
+  res.sendFile(path.join(__dirname, './client/dist/index.html'))
 })
 
 // ----------- Tracker -----------
@@ -133,6 +117,8 @@ app.use(function (err, req, res, next) {
   res.sendStatus(err.status || 500)
 })
 
+// ----------- Run -----------
+
 const port = constants.CONFIG.LISTEN.PORT
 installer.installApplication(function (err) {
   if (err) throw err