X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server.js;h=4c8e8cfd39d03b18614e57fb56a1c1d143582871;hb=0fdadee769ad7a12de59574c5b9062186edb1b29;hp=c971982b37a253297c4a9589128a2f2a60fd718e;hpb=ac2f99eb75ea0295dc08e47b91f4b4d54829d004;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server.js b/server.js
index c971982b3..4c8e8cfd3 100644
--- a/server.js
+++ b/server.js
@@ -1,43 +1,41 @@
 'use strict'
 
 // ----------- Node modules -----------
-var bodyParser = require('body-parser')
-var express = require('express')
-var expressValidator = require('express-validator')
-var http = require('http')
-var morgan = require('morgan')
-var path = require('path')
-var TrackerServer = require('bittorrent-tracker').Server
-var WebSocketServer = require('ws').Server
+const bodyParser = require('body-parser')
+const express = require('express')
+const expressValidator = require('express-validator')
+const http = require('http')
+const morgan = require('morgan')
+const path = require('path')
+const TrackerServer = require('bittorrent-tracker').Server
+const WebSocketServer = require('ws').Server
 
 // Create our main app
-var app = express()
+const app = express()
 
 // ----------- Checker -----------
-var checker = require('./initializers/checker')
+const checker = require('./server/initializers/checker')
 
-var miss = checker.checkConfig()
+const miss = checker.checkConfig()
 if (miss.length !== 0) {
   throw new Error('Miss some configurations keys : ' + miss)
 }
 
-checker.createDirectoriesIfNotExist()
-
 // ----------- PeerTube modules -----------
-var config = require('config')
-var constants = require('./initializers/constants')
-var customValidators = require('./helpers/customValidators')
-var database = require('./initializers/database')
-var logger = require('./helpers/logger')
-var peertubeCrypto = require('./helpers/peertubeCrypto')
-var poolRequests = require('./lib/poolRequests')
-var routes = require('./controllers')
-var utils = require('./helpers/utils')
-var videos = require('./lib/videos')
-var webtorrent = require('./lib/webtorrent')
+const config = require('config')
+const constants = require('./server/initializers/constants')
+const customValidators = require('./server/helpers/customValidators')
+const database = require('./server/initializers/database')
+const installer = require('./server/initializers/installer')
+const logger = require('./server/helpers/logger')
+const poolRequests = require('./server/lib/requestsScheduler')
+const routes = require('./server/controllers')
+const utils = require('./server/helpers/utils')
+const videos = require('./server/lib/videos')
+const webtorrent = require('./server/lib/webtorrent')
 
 // Get configurations
-var port = config.get('listen.port')
+const port = config.get('listen.port')
 
 // ----------- Database -----------
 database.connect()
@@ -58,31 +56,32 @@ app.use(expressValidator({
 
 // ----------- Views, routes and static files -----------
 
-// Livereload
-app.use(require('connect-livereload')({
-  port: 35729
-}))
-
 // Catch sefaults
 require('segfault-handler').registerHandler()
 
-// Static files
-app.use(express.static(path.join(__dirname, '/public'), { maxAge: 0 }))
+// API routes
+const apiRoute = '/api/' + constants.API_VERSION
+app.use(apiRoute, routes.api)
 
-// Jade template from ./views directory
-app.set('views', path.join(__dirname, '/views'))
-app.set('view engine', 'jade')
+// Static files
+app.use('/client', express.static(path.join(__dirname, '/client/dist'), { maxAge: 0 }))
+// 404 for static files not found
+app.use('/client/*', function (req, res, next) {
+  res.sendStatus(404)
+})
 
-// API routes
-var api_route = '/api/' + constants.API_VERSION
-app.use(api_route, routes.api)
+// Thumbnails path for express
+const thumbnailsPhysicalPath = path.join(__dirname, config.get('storage.thumbnails'))
+app.use(constants.THUMBNAILS_STATIC_PATH, express.static(thumbnailsPhysicalPath, { maxAge: 0 }))
 
-// Views routes
-app.use('/', routes.views)
+// Client application
+app.use('/*', function (req, res, next) {
+  res.sendFile(path.join(__dirname, 'client/dist/index.html'))
+})
 
 // ----------- Tracker -----------
 
-var trackerServer = new TrackerServer({
+const trackerServer = new TrackerServer({
   http: false,
   udp: false,
   ws: false,
@@ -97,8 +96,8 @@ trackerServer.on('warning', function (err) {
   logger.error(err)
 })
 
-var server = http.createServer(app)
-var wss = new WebSocketServer({server: server, path: '/tracker/socket'})
+const server = http.createServer(app)
+const wss = new WebSocketServer({server: server, path: '/tracker/socket'})
 wss.on('connection', function (ws) {
   trackerServer.onWebSocketConnection(ws)
 })
@@ -107,35 +106,19 @@ wss.on('connection', function (ws) {
 
 // Catch 404 and forward to error handler
 app.use(function (req, res, next) {
-  var err = new Error('Not Found')
+  const err = new Error('Not Found')
   err.status = 404
   next(err)
 })
 
-// Prod : no stacktraces leaked to user
-if (process.env.NODE_ENV === 'production') {
-  app.use(function (err, req, res, next) {
-    logger.error(err)
-    res.status(err.status || 500)
-    res.render('error', {
-      message: err.message,
-      error: {}
-    })
-  })
-} else {
-  app.use(function (err, req, res, next) {
-    logger.error(err)
-    res.status(err.status || 500)
-    res.render('error', {
-      message: err.message,
-      error: err
-    })
-  })
-}
+app.use(function (err, req, res, next) {
+  logger.error(err)
+  res.sendStatus(err.status || 500)
+})
 
-// ----------- Create the certificates if they don't already exist -----------
-peertubeCrypto.createCertsIfNotExist(function (err) {
+installer.installApplication(function (err) {
   if (err) throw err
+
   // Create/activate the webtorrent module
   webtorrent.create(function () {
     function cleanForExit () {