+// FIXME: https://github.com/nodejs/node/pull/16853
+require('tls').DEFAULT_ECDH_CURVE = 'auto'
+
import { isTestInstance } from './server/helpers/core-utils'
if (isTestInstance()) {
throw new Error('Your configuration files miss keys: ' + missed)
}
-import { API_VERSION, CONFIG, STATIC_PATHS } from './server/initializers/constants'
+import { ACCEPT_HEADERS, API_VERSION, CONFIG, STATIC_PATHS } from './server/initializers/constants'
checkFFmpeg(CONFIG)
const errorMessage = checkConfig()
// ----------- 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())
+import { initDatabaseModels } from './server/initializers/database'
+import { migrate } from './server/initializers/migrator'
+migrate()
+ .then(() => initDatabaseModels(false))
+ .then(() => onDatabaseInitDone())
// ----------- PeerTube modules -----------
-import { migrate, installApplication } from './server/initializers'
-import { activitypubHttpJobScheduler, transcodingJobScheduler, VideosPreviewCache } from './server/lib'
+import { installApplication } from './server/initializers'
+import { activitypubHttpJobScheduler, transcodingJobScheduler } from './server/lib/jobs'
+import { VideosPreviewCache } from './server/lib/cache'
import { apiRouter, clientsRouter, staticRouter, servicesRouter, webfingerRouter, activityPubRouter } from './server/controllers'
// ----------- Command line -----------
}))
// For body requests
app.use(bodyParser.json({
- type: 'application/*+json',
+ type: [ 'application/json', 'application/*+json' ],
limit: '500kb'
}))
app.use(bodyParser.urlencoded({ extended: false }))
// Always serve index client page (the client is a single page application, let it handle routing)
app.use('/*', function (req, res) {
- res.sendFile(path.join(__dirname, '../client/dist/index.html'))
+ if (req.accepts(ACCEPT_HEADERS) === 'html') {
+ return res.sendFile(path.join(__dirname, '../client/dist/index.html'))
+ }
+
+ return res.status(404).end()
})
// ----------- Errors -----------
})
app.use(function (err, req, res, next) {
- logger.error(err)
+ logger.error(err, err)
res.sendStatus(err.status || 500)
})
function onDatabaseInitDone () {
const port = CONFIG.LISTEN.PORT
- // Run the migration scripts if needed
- migrate()
- .then(() => installApplication())
+
+ installApplication()
.then(() => {
// ----------- Make the server listening -----------
server.listen(port, () => {