X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server.ts;h=1286cf521ef15deedb6b9d735c0ff1553d3cdd21;hb=06746a8b253a8824478d2e3b55597afa39b3318b;hp=aa4382ee74f68329447fbb81d855b5cc7acbef6e;hpb=cda03765fe366f028897e9b02dd4a0a19af3c935;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server.ts b/server.ts index aa4382ee7..1286cf521 100644 --- a/server.ts +++ b/server.ts @@ -1,8 +1,7 @@ -// FIXME: https://github.com/nodejs/node/pull/16853 -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() } @@ -24,12 +23,12 @@ 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 { logger } from './server/helpers/logger' -import { API_VERSION, FILES_CACHE, WEBSERVER, loadLanguages } from './server/initializers/constants' import { CONFIG } from './server/initializers/config' +import { API_VERSION, FILES_CACHE, WEBSERVER, loadLanguages } from './server/initializers/constants' +import { logger } from './server/helpers/logger' const missed = checkMissedConfig() if (missed.length !== 0) { @@ -43,6 +42,8 @@ checkFFmpeg(CONFIG) process.exit(-1) }) +checkNodeVersion() + import { checkConfig, checkActivityPubUrls } from './server/initializers/checker-after-init' const errorMessage = checkConfig() @@ -83,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' @@ -93,7 +94,9 @@ import { clientsRouter, feedsRouter, staticRouter, + lazyStaticRouter, servicesRouter, + pluginsRouter, webfingerRouter, trackerRouter, createWebsocketTrackerServer, botsRouter @@ -107,14 +110,19 @@ 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 ----------- cli .option('--no-client', 'Start PeerTube without client interface') + .option('--no-plugins', 'Start PeerTube without plugins/themes enabled') .parse(process.argv) // ----------- App ----------- @@ -129,14 +137,14 @@ if (isTestInstance()) { } // For the logger -morgan.token('remote-addr', req => { - if (req.get('DNT') === '1') { +morgan.token('remote-addr', req => { + 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 => { if (req.get('DNT') === '1') { return useragent.parse(req.get('user-agent')).family } @@ -173,6 +181,9 @@ app.use(apiRoute, apiRouter) // Services (oembed...) app.use('/services', servicesRouter) +// Plugins & themes +app.use('/', pluginsRouter) + app.use('/', activityPubRouter) app.use('/', feedsRouter) app.use('/', webfingerRouter) @@ -181,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) @@ -244,6 +256,8 @@ async function startApplication () { VideosRedundancyScheduler.Instance.enable() RemoveOldHistoryScheduler.Instance.enable() RemoveOldViewsScheduler.Instance.enable() + PluginsCheckScheduler.Instance.enable() + AutoFollowIndexInstances.Instance.enable() // Redis initialization Redis.Instance.init() @@ -253,10 +267,14 @@ async function startApplication () { updateStreamingPlaylistsInfohashesIfNeeded() .catch(err => logger.error('Cannot update streaming playlist infohashes.', { err })) + if (cli.plugins) await PluginManager.Instance.registerPluginsAndThemes() + // Make server listening server.listen(port, hostname, () => { logger.info('Server listening on %s:%d', hostname, port) logger.info('Web server: %s', WEBSERVER.URL) + + Hooks.runAction('action:application.listening') }) process.on('exit', () => {