Fix exception when getting 404 in video watch

[github/Chocobozzz/PeerTube.git] / server.ts

diff --git a/server.ts b/server.ts
index 9c74ddb694024a77b9332824760e05205feb64c8..3f2d27718187c0e001ced9ffc8832a5af76b351a 100644 (file)
--- a/server.ts
+++ b/server.ts
@@ -7,48 +7,46 @@ if (isTestInstance()) {
 // ----------- Node modules -----------
 import * as bodyParser from 'body-parser'
 import * as express from 'express'
-// FIXME: cannot import express-validator
-const expressValidator = require('express-validator')
 import * as http from 'http'
 import * as morgan from 'morgan'
 import * as path from 'path'
-import * as bittorrentTracker from 'bittorrent-tracker'
+import * as bitTorrentTracker from 'bittorrent-tracker'
 import * as cors from 'cors'
 import { Server as WebSocketServer } from 'ws'
 
-const TrackerServer = bittorrentTracker.Server
+const TrackerServer = bitTorrentTracker.Server
 
 process.title = 'peertube'
 
 // Create our main app
 const app = express()
 
-// ----------- Database -----------
-// Do not use barrels because we don't want to load all modules here (we need to initialize database first)
-import { logger } from './server/helpers/logger'
-import { API_VERSION, CONFIG, STATIC_PATHS } from './server/initializers/constants'
-// Initialize database and models
-import { database as db } from './server/initializers/database'
-db.init(false).then(() => onDatabaseInitDone())
-
-// ----------- Checker -----------
+// ----------- Core checker -----------
 import { checkMissedConfig, checkFFmpeg, checkConfig } from './server/initializers/checker'
 
 const missed = checkMissedConfig()
 if (missed.length !== 0) {
-  throw new Error('Miss some configurations keys : ' + missed)
+  throw new Error('Your configuration files miss keys: ' + missed)
 }
-checkFFmpeg()
+
+import { API_VERSION, CONFIG, STATIC_PATHS } from './server/initializers/constants'
+checkFFmpeg(CONFIG)
 
 const errorMessage = checkConfig()
 if (errorMessage !== null) {
   throw new Error(errorMessage)
 }
 
+// ----------- Database -----------
+// Do not use barrels because we don't want to load all modules here (we need to initialize database first)
+import { logger } from './server/helpers/logger'
+// Initialize database and models
+import { database as db } from './server/initializers/database'
+db.init(false).then(() => onDatabaseInitDone())
+
 // ----------- PeerTube modules -----------
 import { migrate, installApplication } from './server/initializers'
 import { JobScheduler, activateSchedulers, VideosPreviewCache } from './server/lib'
-import * as customValidators from './server/helpers/custom-validators'
 import { apiRouter, clientsRouter, staticRouter } from './server/controllers'
 
 // ----------- Command line -----------
@@ -80,10 +78,6 @@ app.use(morgan('combined', {
 // For body requests
 app.use(bodyParser.json({ limit: '500kb' }))
 app.use(bodyParser.urlencoded({ extended: false }))
-// Validate some params for the API
-app.use(expressValidator({
-  customValidators: customValidators
-}))
 
 // ----------- Views, routes and static files -----------