X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fstatic.ts;h=0d94cac9b0beec4366ac7d27d99d1f7fdda6177a;hb=64553e8809271df1113e9143426a27f234410a74;hp=52e10434683f30089fc31b42d8ff9d56e5c83d0f;hpb=76148b27f7501bac061992136852be4303370c8d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/static.ts b/server/controllers/static.ts index 52e104346..0d94cac9b 100644 --- a/server/controllers/static.ts +++ b/server/controllers/static.ts @@ -1,9 +1,9 @@ -import * as cors from 'cors' -import * as express from 'express' +import cors from 'cors' +import express from 'express' import { join } from 'path' import { serveIndexHTML } from '@server/lib/client-html' import { ServerConfigManager } from '@server/lib/server-config-manager' -import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes' +import { HttpStatusCode } from '@shared/models' import { HttpNodeinfoDiasporaSoftwareNsSchema20 } from '../../shared/models/nodeinfo/nodeinfo.model' import { root } from '../helpers/core-utils' import { CONFIG, isEmailEnabled } from '../initializers/config' @@ -19,7 +19,7 @@ import { } from '../initializers/constants' import { getThemeOrDefault } from '../lib/plugins/theme-utils' import { asyncMiddleware } from '../middlewares' -import { cacheRoute } from '../middlewares/cache' +import { cacheRoute } from '../middlewares/cache/cache' import { UserModel } from '../models/user/user' import { VideoModel } from '../models/video/video' import { VideoCommentModel } from '../models/video/video-comment' @@ -32,14 +32,6 @@ staticRouter.use(cors()) Cors is very important to let other servers access torrent and video files */ -// FIXME: deprecated in 3.2, use lazy-statics instead -// Due to historical reasons, we can't really remove this controller -const torrentsPhysicalPath = CONFIG.STORAGE.TORRENTS_DIR -staticRouter.use( - STATIC_PATHS.TORRENTS, - express.static(torrentsPhysicalPath, { maxAge: 0 }) // Don't cache because we could regenerate the torrent file -) - // Videos path for webseed staticRouter.use( STATIC_PATHS.WEBSEED, @@ -66,9 +58,10 @@ staticRouter.use( // robots.txt service staticRouter.get('/robots.txt', - asyncMiddleware(cacheRoute()(ROUTE_CACHE_LIFETIME.ROBOTS)), + cacheRoute(ROUTE_CACHE_LIFETIME.ROBOTS), (_, res: express.Response) => { res.type('text/plain') + return res.send(CONFIG.INSTANCE.ROBOTS) } ) @@ -86,7 +79,7 @@ staticRouter.get('/security.txt', ) staticRouter.get('/.well-known/security.txt', - asyncMiddleware(cacheRoute()(ROUTE_CACHE_LIFETIME.SECURITYTXT)), + cacheRoute(ROUTE_CACHE_LIFETIME.SECURITYTXT), (_, res: express.Response) => { res.type('text/plain') return res.send(CONFIG.INSTANCE.SECURITYTXT + CONFIG.INSTANCE.SECURITYTXT_CONTACT) @@ -95,7 +88,7 @@ staticRouter.get('/.well-known/security.txt', // nodeinfo service staticRouter.use('/.well-known/nodeinfo', - asyncMiddleware(cacheRoute()(ROUTE_CACHE_LIFETIME.NODEINFO)), + cacheRoute(ROUTE_CACHE_LIFETIME.NODEINFO), (_, res: express.Response) => { return res.json({ links: [ @@ -108,13 +101,13 @@ staticRouter.use('/.well-known/nodeinfo', } ) staticRouter.use('/nodeinfo/:version.json', - asyncMiddleware(cacheRoute()(ROUTE_CACHE_LIFETIME.NODEINFO)), + cacheRoute(ROUTE_CACHE_LIFETIME.NODEINFO), asyncMiddleware(generateNodeinfo) ) // dnt-policy.txt service (see https://www.eff.org/dnt-policy) staticRouter.use('/.well-known/dnt-policy.txt', - asyncMiddleware(cacheRoute()(ROUTE_CACHE_LIFETIME.DNT_POLICY)), + cacheRoute(ROUTE_CACHE_LIFETIME.DNT_POLICY), (_, res: express.Response) => { res.type('text/plain') @@ -161,143 +154,144 @@ async function generateNodeinfo (req: express.Request, res: express.Response) { const { totalLocalVideoComments } = await VideoCommentModel.getStats() const { totalUsers, totalMonthlyActiveUsers, totalHalfYearActiveUsers } = await UserModel.getStats() - if (req.params.version && (req.params.version === '2.0')) { - const json = { - version: '2.0', - software: { - name: 'peertube', - version: PEERTUBE_VERSION + if (!req.params.version || req.params.version !== '2.0') { + return res.fail({ + status: HttpStatusCode.NOT_FOUND_404, + message: 'Nodeinfo schema version not handled' + }) + } + + const json = { + version: '2.0', + software: { + name: 'peertube', + version: PEERTUBE_VERSION + }, + protocols: [ + 'activitypub' + ], + services: { + inbound: [], + outbound: [ + 'atom1.0', + 'rss2.0' + ] + }, + openRegistrations: CONFIG.SIGNUP.ENABLED, + usage: { + users: { + total: totalUsers, + activeMonth: totalMonthlyActiveUsers, + activeHalfyear: totalHalfYearActiveUsers }, - protocols: [ - 'activitypub' - ], - services: { - inbound: [], - outbound: [ - 'atom1.0', - 'rss2.0' - ] + localPosts: totalVideos, + localComments: totalLocalVideoComments + }, + metadata: { + taxonomy: { + postsName: 'Videos' }, - openRegistrations: CONFIG.SIGNUP.ENABLED, - usage: { - users: { - total: totalUsers, - activeMonth: totalMonthlyActiveUsers, - activeHalfyear: totalHalfYearActiveUsers + nodeName: CONFIG.INSTANCE.NAME, + nodeDescription: CONFIG.INSTANCE.SHORT_DESCRIPTION, + nodeConfig: { + search: { + remoteUri: { + users: CONFIG.SEARCH.REMOTE_URI.USERS, + anonymous: CONFIG.SEARCH.REMOTE_URI.ANONYMOUS + } }, - localPosts: totalVideos, - localComments: totalLocalVideoComments - }, - metadata: { - taxonomy: { - postsName: 'Videos' + plugin: { + registered: ServerConfigManager.Instance.getRegisteredPlugins() }, - nodeName: CONFIG.INSTANCE.NAME, - nodeDescription: CONFIG.INSTANCE.SHORT_DESCRIPTION, - nodeConfig: { - search: { - remoteUri: { - users: CONFIG.SEARCH.REMOTE_URI.USERS, - anonymous: CONFIG.SEARCH.REMOTE_URI.ANONYMOUS - } - }, - plugin: { - registered: ServerConfigManager.Instance.getRegisteredPlugins() - }, - theme: { - registered: ServerConfigManager.Instance.getRegisteredThemes(), - default: getThemeOrDefault(CONFIG.THEME.DEFAULT, DEFAULT_THEME_NAME) - }, - email: { - enabled: isEmailEnabled() + theme: { + registered: ServerConfigManager.Instance.getRegisteredThemes(), + default: getThemeOrDefault(CONFIG.THEME.DEFAULT, DEFAULT_THEME_NAME) + }, + email: { + enabled: isEmailEnabled() + }, + contactForm: { + enabled: CONFIG.CONTACT_FORM.ENABLED + }, + transcoding: { + hls: { + enabled: CONFIG.TRANSCODING.HLS.ENABLED }, - contactForm: { - enabled: CONFIG.CONTACT_FORM.ENABLED + webtorrent: { + enabled: CONFIG.TRANSCODING.WEBTORRENT.ENABLED }, + enabledResolutions: ServerConfigManager.Instance.getEnabledResolutions('vod') + }, + live: { + enabled: CONFIG.LIVE.ENABLED, transcoding: { - hls: { - enabled: CONFIG.TRANSCODING.HLS.ENABLED - }, - webtorrent: { - enabled: CONFIG.TRANSCODING.WEBTORRENT.ENABLED + enabled: CONFIG.LIVE.TRANSCODING.ENABLED, + enabledResolutions: ServerConfigManager.Instance.getEnabledResolutions('live') + } + }, + import: { + videos: { + http: { + enabled: CONFIG.IMPORT.VIDEOS.HTTP.ENABLED }, - enabledResolutions: ServerConfigManager.Instance.getEnabledResolutions('vod') - }, - live: { - enabled: CONFIG.LIVE.ENABLED, - transcoding: { - enabled: CONFIG.LIVE.TRANSCODING.ENABLED, - enabledResolutions: ServerConfigManager.Instance.getEnabledResolutions('live') - } - }, - import: { - videos: { - http: { - enabled: CONFIG.IMPORT.VIDEOS.HTTP.ENABLED - }, - torrent: { - enabled: CONFIG.IMPORT.VIDEOS.TORRENT.ENABLED - } + torrent: { + enabled: CONFIG.IMPORT.VIDEOS.TORRENT.ENABLED } - }, - autoBlacklist: { - videos: { - ofUsers: { - enabled: CONFIG.AUTO_BLACKLIST.VIDEOS.OF_USERS.ENABLED - } - } - }, - avatar: { - file: { - size: { - max: CONSTRAINTS_FIELDS.ACTORS.IMAGE.FILE_SIZE.max - }, - extensions: CONSTRAINTS_FIELDS.ACTORS.IMAGE.EXTNAME + } + }, + autoBlacklist: { + videos: { + ofUsers: { + enabled: CONFIG.AUTO_BLACKLIST.VIDEOS.OF_USERS.ENABLED } - }, - video: { - image: { - extensions: CONSTRAINTS_FIELDS.VIDEOS.IMAGE.EXTNAME, - size: { - max: CONSTRAINTS_FIELDS.VIDEOS.IMAGE.FILE_SIZE.max - } + } + }, + avatar: { + file: { + size: { + max: CONSTRAINTS_FIELDS.ACTORS.IMAGE.FILE_SIZE.max }, - file: { - extensions: CONSTRAINTS_FIELDS.VIDEOS.EXTNAME - } - }, - videoCaption: { - file: { - size: { - max: CONSTRAINTS_FIELDS.VIDEO_CAPTIONS.CAPTION_FILE.FILE_SIZE.max - }, - extensions: CONSTRAINTS_FIELDS.VIDEO_CAPTIONS.CAPTION_FILE.EXTNAME - } - }, - user: { - videoQuota: CONFIG.USER.VIDEO_QUOTA, - videoQuotaDaily: CONFIG.USER.VIDEO_QUOTA_DAILY - }, - trending: { - videos: { - intervalDays: CONFIG.TRENDING.VIDEOS.INTERVAL_DAYS + extensions: CONSTRAINTS_FIELDS.ACTORS.IMAGE.EXTNAME + } + }, + video: { + image: { + extensions: CONSTRAINTS_FIELDS.VIDEOS.IMAGE.EXTNAME, + size: { + max: CONSTRAINTS_FIELDS.VIDEOS.IMAGE.FILE_SIZE.max } }, - tracker: { - enabled: CONFIG.TRACKER.ENABLED + file: { + extensions: CONSTRAINTS_FIELDS.VIDEOS.EXTNAME + } + }, + videoCaption: { + file: { + size: { + max: CONSTRAINTS_FIELDS.VIDEO_CAPTIONS.CAPTION_FILE.FILE_SIZE.max + }, + extensions: CONSTRAINTS_FIELDS.VIDEO_CAPTIONS.CAPTION_FILE.EXTNAME } + }, + user: { + videoQuota: CONFIG.USER.VIDEO_QUOTA, + videoQuotaDaily: CONFIG.USER.VIDEO_QUOTA_DAILY + }, + trending: { + videos: { + intervalDays: CONFIG.TRENDING.VIDEOS.INTERVAL_DAYS + } + }, + tracker: { + enabled: CONFIG.TRACKER.ENABLED } } - } as HttpNodeinfoDiasporaSoftwareNsSchema20 - res.contentType('application/json; profile="http://nodeinfo.diaspora.software/ns/schema/2.0#"') - .send(json) - .end() - } + } + } as HttpNodeinfoDiasporaSoftwareNsSchema20 - return res.fail({ - status: HttpStatusCode.NOT_FOUND_404, - message: 'Nodeinfo schema version not handled' - }) + res.contentType('application/json; profile="http://nodeinfo.diaspora.software/ns/schema/2.0#"') + .send(json) + .end() } function getCup (req: express.Request, res: express.Response, next: express.NextFunction) {