X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server.ts;h=6963bbf235a5b5958d442bbcbff57a7b186f4d80;hb=64b5c2476ab750512676ef8a0ae9e9ab6ddb0d91;hp=d5f8f0b2b872398594694ae5fc71280e4362b1be;hpb=8424c4026afd7304880a4ce8138a04ffb3d8c938;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server.ts b/server.ts
index d5f8f0b2b..6963bbf23 100644
--- a/server.ts
+++ b/server.ts
@@ -1,12 +1,7 @@
-require('module-alias/register')
-
-// FIXME: https://github.com/nodejs/node/pull/16853
-import { PluginManager } from './server/lib/plugins/plugin-manager'
-
-require('tls').DEFAULT_ECDH_CURVE = 'auto'
+import { registerTSPaths } from './server/helpers/register-ts-paths'
+registerTSPaths()
 
 import { isTestInstance } from './server/helpers/core-utils'
-
 if (isTestInstance()) {
   require('source-map-support').install()
 }
@@ -75,7 +70,9 @@ if (CONFIG.CSP.ENABLED) {
 // ----------- Database -----------
 
 // Initialize database and models
-import { initDatabaseModels } from './server/initializers/database'
+import { initDatabaseModels, checkDatabaseConnectionOrDie } from './server/initializers/database'
+checkDatabaseConnectionOrDie()
+
 import { migrate } from './server/initializers/migrator'
 migrate()
   .then(() => initDatabaseModels(false))
@@ -89,7 +86,7 @@ migrate()
 loadLanguages()
 
 // ----------- PeerTube modules -----------
-import { installApplication } from './server/initializers'
+import { installApplication } from './server/initializers/installer'
 import { Emailer } from './server/lib/emailer'
 import { JobQueue } from './server/lib/job-queue'
 import { VideosPreviewCache, VideosCaptionCache } from './server/lib/files-cache'
@@ -101,10 +98,12 @@ import {
   staticRouter,
   lazyStaticRouter,
   servicesRouter,
+  liveRouter,
   pluginsRouter,
   webfingerRouter,
   trackerRouter,
-  createWebsocketTrackerServer, botsRouter
+  createWebsocketTrackerServer,
+  botsRouter
 } from './server/controllers'
 import { advertiseDoNotTrack } from './server/middlewares/dnt'
 import { Redis } from './server/lib/redis'
@@ -115,11 +114,14 @@ import { UpdateVideosScheduler } from './server/lib/schedulers/update-videos-sch
 import { YoutubeDlUpdateScheduler } from './server/lib/schedulers/youtube-dl-update-scheduler'
 import { VideosRedundancyScheduler } from './server/lib/schedulers/videos-redundancy-scheduler'
 import { RemoveOldHistoryScheduler } from './server/lib/schedulers/remove-old-history-scheduler'
+import { AutoFollowIndexInstances } from './server/lib/schedulers/auto-follow-index-instances'
 import { isHTTPSignatureDigestValid } from './server/helpers/peertube-crypto'
 import { PeerTubeSocket } from './server/lib/peertube-socket'
 import { updateStreamingPlaylistsInfohashesIfNeeded } from './server/lib/hls'
 import { PluginsCheckScheduler } from './server/lib/schedulers/plugins-check-scheduler'
 import { Hooks } from './server/lib/plugins/hooks'
+import { PluginManager } from './server/lib/plugins/plugin-manager'
+import { LiveManager } from '@server/lib/live-manager'
 
 // ----------- Command line -----------
 
@@ -140,14 +142,14 @@ if (isTestInstance()) {
 }
 
 // For the logger
-morgan.token('remote-addr', req => {
-  if (req.get('DNT') === '1') {
+morgan.token('remote-addr', (req: express.Request) => {
+  if (CONFIG.LOG.ANONYMIZE_IP === true || req.get('DNT') === '1') {
     return anonymize(req.ip, 16, 16)
   }
 
   return req.ip
 })
-morgan.token('user-agent', req => {
+morgan.token('user-agent', (req: express.Request) => {
   if (req.get('DNT') === '1') {
     return useragent.parse(req.get('user-agent')).family
   }
@@ -184,6 +186,9 @@ app.use(apiRoute, apiRouter)
 // Services (oembed...)
 app.use('/services', servicesRouter)
 
+// Live streaming
+app.use('/live', liveRouter)
+
 // Plugins & themes
 app.use('/', pluginsRouter)
 
@@ -260,6 +265,7 @@ async function startApplication () {
   RemoveOldHistoryScheduler.Instance.enable()
   RemoveOldViewsScheduler.Instance.enable()
   PluginsCheckScheduler.Instance.enable()
+  AutoFollowIndexInstances.Instance.enable()
 
   // Redis initialization
   Redis.Instance.init()
@@ -271,6 +277,9 @@ async function startApplication () {
 
   if (cli.plugins) await PluginManager.Instance.registerPluginsAndThemes()
 
+  LiveManager.Instance.init()
+  if (CONFIG.LIVE.ENABLED) LiveManager.Instance.run()
+
   // Make server listening
   server.listen(port, hostname, () => {
     logger.info('Server listening on %s:%d', hostname, port)