X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server.ts;h=f64c4ac53f5ff81481b24488dba52b8a06f5fa98;hb=ea44f375f5d3da06ca0aebfe871b9f924a26ec29;hp=84535c7a5ab5e53bfacc23fb7b82e2ce90a93779;hpb=afffe98839db7ccbfa9fb8b7d1413b97900fdc73;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server.ts b/server.ts
index 84535c7a5..f64c4ac53 100644
--- a/server.ts
+++ b/server.ts
@@ -29,7 +29,7 @@ if (missed.length !== 0) {
   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()
@@ -40,13 +40,18 @@ if (errorMessage !== null) {
 // ----------- 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 -----------
@@ -76,7 +81,10 @@ app.use(morgan('combined', {
   stream: { write: logger.info }
 }))
 // For body requests
-app.use(bodyParser.json({ limit: '500kb' }))
+app.use(bodyParser.json({
+  type: [ 'application/json', 'application/*+json' ],
+  limit: '500kb'
+}))
 app.use(bodyParser.urlencoded({ extended: false }))
 
 // ----------- Tracker -----------
@@ -126,7 +134,11 @@ app.use('/', staticRouter)
 
 // 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 -----------
@@ -147,9 +159,8 @@ app.use(function (err, req, res, next) {
 
 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, () => {