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

diff --git a/server.js b/server.js
index b748a0242..9322bca19 100644
--- a/server.js
+++ b/server.js
@@ -1,44 +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
 
 // Create our main app
-var app = express()
+const app = express()
 
 // ----------- Checker -----------
-var checker = require('./server/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)
 }
 
+// ----------- 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()
+
 // ----------- 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 installer = require('./server/initializers/installer')
-var logger = require('./server/helpers/logger')
-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')
+const customValidators = require('./server/helpers/customValidators')
+const installer = require('./server/initializers/installer')
+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
-var port = config.get('listen.port')
-
-// ----------- Database -----------
-database.connect()
+const port = config.get('listen.port')
 
 // ----------- Command line -----------
 
@@ -56,33 +58,32 @@ app.use(expressValidator({
 
 // ----------- Views, routes and static files -----------
 
-// Livereload
-app.use(require('connect-livereload')({
-  port: 35729
-}))
-
 // Catch sefaults
 require('segfault-handler').registerHandler()
 
 // API routes
-var api_route = '/api/' + constants.API_VERSION
-app.use(api_route, routes.api)
+const apiRoute = '/api/' + constants.API_VERSION
+app.use(apiRoute, routes.api)
 
 // Static files
-app.use('/app', express.static(path.join(__dirname, '/client'), { maxAge: 0 }))
+app.use('/client', express.static(path.join(__dirname, '/client/dist'), { maxAge: 0 }))
 // 404 for static files not found
-app.use('/app/*', function (req, res, next) {
+app.use('/client/*', function (req, res, next) {
   res.sendStatus(404)
 })
 
+// Thumbnails path for express
+const thumbnailsPhysicalPath = path.join(__dirname, config.get('storage.thumbnails'))
+app.use(constants.THUMBNAILS_STATIC_PATH, express.static(thumbnailsPhysicalPath, { maxAge: 0 }))
+
 // Client application
 app.use('/*', function (req, res, next) {
-  res.sendFile(path.join(__dirname, 'client/index.html'))
+  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 +98,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,7 +108,7 @@ 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)
 })
@@ -137,9 +138,11 @@ installer.installApplication(function (err) {
     // ----------- Make the server listening -----------
     server.listen(port, function () {
       // Activate the pool requests
-      poolRequests.activate()
+      Request.activate()
+
+      Video.seedAllExisting(function (err) {
+        if (err) throw err
 
-      videos.seedAllExisting(function () {
         logger.info('Seeded all the videos')
         logger.info('Server listening on port %d', port)
         app.emit('ready')