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()
// ----------- PeerTube modules -----------
import { migrate, installApplication } from './server/initializers'
-import { httpRequestJobScheduler, transcodingJobScheduler, VideosPreviewCache } from './server/lib'
-import { apiRouter, clientsRouter, staticRouter, servicesRouter } from './server/controllers'
+import { activitypubHttpJobScheduler, transcodingJobScheduler, VideosPreviewCache } from './server/lib'
+import { apiRouter, clientsRouter, staticRouter, servicesRouter, webfingerRouter, activityPubRouter } from './server/controllers'
// ----------- Command line -----------
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 -----------
// Services (oembed...)
app.use('/services', servicesRouter)
+app.use('/', webfingerRouter)
+app.use('/', activityPubRouter)
+
// Client files
app.use('/', clientsRouter)
// 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 -----------
// ----------- Make the server listening -----------
server.listen(port, () => {
VideosPreviewCache.Instance.init(CONFIG.CACHE.PREVIEWS.SIZE)
- httpRequestJobScheduler.activate()
+ activitypubHttpJobScheduler.activate()
transcodingJobScheduler.activate()
logger.info('Server listening on port %d', port)