X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server.js;h=33d399786da00edd0f787ee8cba3b7819ed09ba9;hb=85ec3eb7f37d71be99566c6c5c43f0f8a80b9b09;hp=5f474a1962128b9de731b0f8dafb527e8c527613;hpb=b9a3e09ad5a7673f64556d1dba122ed4c4fac980;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server.js b/server.js
index 5f474a196..33d399786 100644
--- a/server.js
+++ b/server.js
@@ -1,46 +1,46 @@
 '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
+
+process.title = 'peertube'
 
 // Create our main app
-var app = express()
+const app = express()
+
+// ----------- Database -----------
+const constants = require('./server/initializers/constants')
+const logger = require('./server/helpers/logger')
+// Initialize database and models
+const db = require('./server/initializers/database')
+db.init(onDatabaseInitDone)
 
 // ----------- Checker -----------
-var checker = require('./server/initializers/checker')
+const checker = require('./server/initializers/checker')
 
-var miss = checker.checkConfig()
-if (miss.length !== 0) {
-  throw new Error('Miss some configurations keys : ' + miss)
+const missed = checker.checkMissedConfig()
+if (missed.length !== 0) {
+  throw new Error('Miss some configurations keys : ' + missed)
 }
 
-checker.createDirectoriesIfNotExist()
+const errorMessage = checker.checkConfig()
+if (errorMessage !== null) {
+  throw new Error(errorMessage)
+}
 
 // ----------- PeerTube modules -----------
-var config = require('config')
-var constants = require('./server/initializers/constants')
-var customValidators = require('./server/helpers/customValidators')
-var database = require('./server/initializers/database')
-var logger = require('./server/helpers/logger')
-var peertubeCrypto = require('./server/helpers/peertubeCrypto')
-var poolRequests = require('./server/lib/poolRequests')
-var routes = require('./server/controllers')
-var utils = require('./server/helpers/utils')
-var videos = require('./server/lib/videos')
-var webtorrent = require('./server/lib/webtorrent')
-
-// Get configurations
-var port = config.get('listen.port')
-
-// ----------- Database -----------
-database.connect()
+const customValidators = require('./server/helpers/custom-validators')
+const friends = require('./server/lib/friends')
+const installer = require('./server/initializers/installer')
+const migrator = require('./server/initializers/migrator')
+const routes = require('./server/controllers')
 
 // ----------- Command line -----------
 
@@ -49,36 +49,40 @@ database.connect()
 // For the logger
 app.use(morgan('combined', { stream: logger.stream }))
 // For body requests
-app.use(bodyParser.json())
+app.use(bodyParser.json({ limit: '500kb' }))
 app.use(bodyParser.urlencoded({ extended: false }))
 // Validate some params for the API
 app.use(expressValidator({
-  customValidators: customValidators
+  customValidators: Object.assign(
+    {},
+    customValidators.misc,
+    customValidators.pods,
+    customValidators.users,
+    customValidators.videos,
+    customValidators.remote.videos
+  )
 }))
 
 // ----------- Views, routes and static files -----------
 
-// Livereload
-app.use(require('connect-livereload')({
-  port: 35729
-}))
+// API
+const apiRoute = '/api/' + constants.API_VERSION
+app.use(apiRoute, routes.api)
 
-// Catch sefaults
-require('segfault-handler').registerHandler()
+// Client files
+app.use('/', routes.client)
 
 // Static files
-app.use(express.static(path.join(__dirname, '/app'), { maxAge: 0 }))
-
-// API routes
-var api_route = '/api/' + constants.API_VERSION
-app.use(api_route, routes.api)
+app.use('/', routes.static)
 
-// Views routes
-app.use('/', routes.views)
+// 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'))
+})
 
 // ----------- Tracker -----------
 
-var trackerServer = new TrackerServer({
+const trackerServer = new TrackerServer({
   http: false,
   udp: false,
   ws: false,
@@ -93,8 +97,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)
 })
@@ -103,61 +107,39 @@ 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)
+})
+
+// ----------- Run -----------
+
+function onDatabaseInitDone () {
+  const port = constants.CONFIG.LISTEN.PORT
+    // Run the migration scripts if needed
+  migrator.migrate(function (err) {
+    if (err) throw err
+
+    installer.installApplication(function (err) {
+      if (err) throw err
+
+      // ----------- Make the server listening -----------
+      server.listen(port, function () {
+        // Activate the communication with friends
+        friends.activate()
 
-// ----------- Create the certificates if they don't already exist -----------
-peertubeCrypto.createCertsIfNotExist(function (err) {
-  if (err) throw err
-  // Create/activate the webtorrent module
-  webtorrent.create(function () {
-    function cleanForExit () {
-      utils.cleanForExit(webtorrent.app)
-    }
-
-    function exitGracefullyOnSignal () {
-      process.exit(-1)
-    }
-
-    process.on('exit', cleanForExit)
-    process.on('SIGINT', exitGracefullyOnSignal)
-    process.on('SIGTERM', exitGracefullyOnSignal)
-
-    // ----------- Make the server listening -----------
-    server.listen(port, function () {
-      // Activate the pool requests
-      poolRequests.activate()
-
-      videos.seedAllExisting(function () {
-        logger.info('Seeded all the videos')
         logger.info('Server listening on port %d', port)
+        logger.info('Webserver: %s', constants.CONFIG.WEBSERVER.URL)
+
         app.emit('ready')
       })
     })
   })
-})
+}
 
 module.exports = app