X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=server.ts;h=e18e2be5c305c68a8fa8b74c4b899682ea3377c6;hb=923ff87da2761fd88a8ca269ac1ef403abb583d2;hp=abfeeed2e02ad5a2f17b2f56a347bdebbdc88570;hpb=89cd12756035a146bbcc4db78cd3cd64f2f3d88d;p=oweals%2Fpeertube.git diff --git a/server.ts b/server.ts index abfeeed2e..e18e2be5c 100644 --- a/server.ts +++ b/server.ts @@ -1,10 +1,7 @@ -// 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() } @@ -26,7 +23,7 @@ process.title = 'peertube' const app = express() // ----------- Core checker ----------- -import { checkMissedConfig, checkFFmpeg } from './server/initializers/checker-before-init' +import { checkMissedConfig, checkFFmpeg, checkNodeVersion } from './server/initializers/checker-before-init' // Do not use barrels because we don't want to load all modules here (we need to initialize database first) import { CONFIG } from './server/initializers/config' @@ -45,6 +42,8 @@ checkFFmpeg(CONFIG) process.exit(-1) }) +checkNodeVersion() + import { checkConfig, checkActivityPubUrls } from './server/initializers/checker-after-init' const errorMessage = checkConfig() @@ -85,7 +84,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' @@ -95,6 +94,7 @@ import { clientsRouter, feedsRouter, staticRouter, + lazyStaticRouter, servicesRouter, pluginsRouter, webfingerRouter, @@ -110,11 +110,13 @@ 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' // ----------- Command line ----------- @@ -136,7 +138,7 @@ if (isTestInstance()) { // For the logger morgan.token('remote-addr', req => { - if (req.get('DNT') === '1') { + if (CONFIG.LOG.ANONYMIZE_IP === true || req.get('DNT') === '1') { return anonymize(req.ip, 16, 16) } @@ -190,6 +192,7 @@ app.use('/', botsRouter) // Static files app.use('/', staticRouter) +app.use('/', lazyStaticRouter) // Client files, last valid routes! if (cli.client) app.use('/', clientsRouter) @@ -254,6 +257,7 @@ async function startApplication () { RemoveOldHistoryScheduler.Instance.enable() RemoveOldViewsScheduler.Instance.enable() PluginsCheckScheduler.Instance.enable() + AutoFollowIndexInstances.Instance.enable() // Redis initialization Redis.Instance.init()