X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server.js;h=33d399786da00edd0f787ee8cba3b7819ed09ba9;hb=3758da9489b636997a3a4fad7fc1a6081737bbe0;hp=b8564d05aaad5720d913098fe12fdf010400d521;hpb=00d6b0dda4b1964ab11127851c0fc7106cc0f912;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server.js b/server.js
index b8564d05a..33d399786 100644
--- a/server.js
+++ b/server.js
@@ -10,38 +10,37 @@ 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 config = require('config')
 const constants = require('./server/initializers/constants')
-const database = require('./server/initializers/database')
 const logger = require('./server/helpers/logger')
-
-database.connect()
+// Initialize database and models
+const db = require('./server/initializers/database')
+db.init(onDatabaseInitDone)
 
 // ----------- 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)
+}
+
+const errorMessage = checker.checkConfig()
+if (errorMessage !== null) {
+  throw new Error(errorMessage)
 }
 
 // ----------- PeerTube modules -----------
 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 mongoose = require('mongoose')
 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 -----------
 
@@ -59,33 +58,26 @@ app.use(expressValidator({
     customValidators.misc,
     customValidators.pods,
     customValidators.users,
-    customValidators.videos
+    customValidators.videos,
+    customValidators.remote.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 -----------
@@ -125,42 +117,29 @@ app.use(function (err, req, res, next) {
   res.sendStatus(err.status || 500)
 })
 
-installer.installApplication(function (err) {
-  if (err) throw err
+// ----------- Run -----------
 
-  // Run the migration scripts if needed
+function onDatabaseInitDone () {
+  const port = constants.CONFIG.LISTEN.PORT
+    // Run the migration scripts if needed
   migrator.migrate(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)
+    installer.installApplication(function (err) {
+      if (err) throw err
 
       // ----------- Make the server listening -----------
       server.listen(port, function () {
-        // Activate the pool requests
-        Request.activate()
+        // Activate the communication with friends
+        friends.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')
       })
     })
   })
-})
+}
 
 module.exports = app