X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server.js;h=f4ca539078e86205a90b91ba33339c231d24ac84;hb=b769007f733769d3afe2d29a3eb23e2e7693f301;hp=9322bca19e500038fced0335f8a644a09c786248;hpb=907e9510c28b4b2816cba0c070e3feaa16b10ac3;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server.js b/server.js
index 9322bca19..f4ca53907 100644
--- a/server.js
+++ b/server.js
@@ -10,37 +10,36 @@ const path = require('path')
 const TrackerServer = require('bittorrent-tracker').Server
 const WebSocketServer = require('ws').Server
 
+process.title = 'peertube'
+
 // Create our main app
 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()
+
 // ----------- Checker -----------
 const checker = require('./server/initializers/checker')
 
-const 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)
 }
 
-// ----------- Database -----------
-const config = require('config')
-const constants = require('./server/initializers/constants')
-const database = require('./server/initializers/database')
-const logger = require('./server/helpers/logger')
-
-database.connect()
+const errorMessage = checker.checkConfig()
+if (errorMessage !== null) {
+  throw new Error(errorMessage)
+}
 
 // ----------- PeerTube modules -----------
-const customValidators = require('./server/helpers/customValidators')
+const customValidators = require('./server/helpers/custom-validators')
 const installer = require('./server/initializers/installer')
-const mongoose = require('mongoose')
+const migrator = require('./server/initializers/migrator')
 const routes = require('./server/controllers')
-const utils = require('./server/helpers/utils')
-const webtorrent = require('./server/lib/webtorrent')
-const Request = mongoose.model('Request')
-const Video = mongoose.model('Video')
-
-// Get configurations
-const port = config.get('listen.port')
 
 // ----------- Command line -----------
 
@@ -49,36 +48,34 @@ const port = config.get('listen.port')
 // 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
+  )
 }))
 
 // ----------- Views, routes and static files -----------
 
-// Catch sefaults
-require('segfault-handler').registerHandler()
-
-// 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: 0 }))
-// 404 for static files not found
-app.use('/client/*', function (req, res, next) {
-  res.sendStatus(404)
-})
+// Client files
+app.use('/', routes.client)
 
-// Thumbnails path for express
-const thumbnailsPhysicalPath = path.join(__dirname, config.get('storage.thumbnails'))
-app.use(constants.THUMBNAILS_STATIC_PATH, express.static(thumbnailsPhysicalPath, { maxAge: 0 }))
+// Static files
+app.use('/', routes.static)
 
-// Client application
+// 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 -----------
@@ -118,35 +115,25 @@ 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
 
-  // 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)
+  // Run the migration scripts if needed
+  migrator.migrate(function (err) {
+    if (err) throw err
 
     // ----------- Make the server listening -----------
     server.listen(port, function () {
       // Activate the pool requests
-      Request.activate()
+      db.Request.activate()
 
-      Video.seedAllExisting(function (err) {
-        if (err) throw err
+      logger.info('Server listening on port %d', port)
+      logger.info('Webserver: %s', constants.CONFIG.WEBSERVER.URL)
 
-        logger.info('Seeded all the videos')
-        logger.info('Server listening on port %d', port)
-        app.emit('ready')
-      })
+      app.emit('ready')
     })
   })
 })