X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fstatic.ts;h=271b788f6688885301e972ba94b2937e09c072cc;hb=ebefc902f59be6c5542c19ff706e310d9dddf75f;hp=0f47723100ef165f9f290553b76dba237e1f6293;hpb=001ed2d40c8d2c8f494f5dc7f91ed62d56df10fd;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/static.ts b/server/controllers/static.ts index 0f4772310..271b788f6 100644 --- a/server/controllers/static.ts +++ b/server/controllers/static.ts @@ -1,6 +1,8 @@ import * as cors from 'cors' import * as express from 'express' import { + CONSTRAINTS_FIELDS, + DEFAULT_THEME_NAME, HLS_STREAMING_PLAYLIST_DIRECTORY, PEERTUBE_VERSION, ROUTE_CACHE_LIFETIME, @@ -10,15 +12,20 @@ import { WEBSERVER } from '../initializers/constants' import { cacheRoute } from '../middlewares/cache' -import { asyncMiddleware, videosGetValidator } from '../middlewares' +import { asyncMiddleware, videosDownloadValidator } from '../middlewares' import { VideoModel } from '../models/video/video' import { UserModel } from '../models/account/user' import { VideoCommentModel } from '../models/video/video-comment' import { HttpNodeinfoDiasporaSoftwareNsSchema20 } from '../../shared/models/nodeinfo' import { join } from 'path' import { root } from '../helpers/core-utils' -import { CONFIG } from '../initializers/config' +import { CONFIG, isEmailEnabled } from '../initializers/config' import { getPreview, getVideoCaption } from './lazy-static' +import { VideoStreamingPlaylistType } from '@shared/models/videos/video-streaming-playlist.type' +import { MVideoFile, MVideoFullLight } from '@server/typings/models' +import { getTorrentFilePath, getVideoFilePath } from '@server/lib/video-paths' +import { getThemeOrDefault } from '../lib/plugins/theme-utils' +import { getEnabledResolutions, getRegisteredPlugins, getRegisteredThemes } from '@server/controllers/api/config' const staticRouter = express.Router() @@ -36,8 +43,13 @@ staticRouter.use( ) staticRouter.use( STATIC_DOWNLOAD_PATHS.TORRENTS + ':id-:resolution([0-9]+).torrent', - asyncMiddleware(videosGetValidator), - asyncMiddleware(downloadTorrent) + asyncMiddleware(videosDownloadValidator), + downloadTorrent +) +staticRouter.use( + STATIC_DOWNLOAD_PATHS.TORRENTS + ':id-:resolution([0-9]+)-hls.torrent', + asyncMiddleware(videosDownloadValidator), + downloadHLSVideoFileTorrent ) // Videos path for webseeding @@ -54,8 +66,14 @@ staticRouter.use( staticRouter.use( STATIC_DOWNLOAD_PATHS.VIDEOS + ':id-:resolution([0-9]+).:extension', - asyncMiddleware(videosGetValidator), - asyncMiddleware(downloadVideoFile) + asyncMiddleware(videosDownloadValidator), + downloadVideoFile +) + +staticRouter.use( + STATIC_DOWNLOAD_PATHS.HLS_VIDEOS + ':id-:resolution([0-9]+)-fragmented.:extension', + asyncMiddleware(videosDownloadValidator), + downloadHLSVideoFile ) // HLS @@ -93,7 +111,7 @@ staticRouter.use( // robots.txt service staticRouter.get('/robots.txt', - asyncMiddleware(cacheRoute(ROUTE_CACHE_LIFETIME.ROBOTS)), + asyncMiddleware(cacheRoute()(ROUTE_CACHE_LIFETIME.ROBOTS)), (_, res: express.Response) => { res.type('text/plain') return res.send(CONFIG.INSTANCE.ROBOTS) @@ -108,7 +126,7 @@ staticRouter.get('/security.txt', ) staticRouter.get('/.well-known/security.txt', - asyncMiddleware(cacheRoute(ROUTE_CACHE_LIFETIME.SECURITYTXT)), + asyncMiddleware(cacheRoute()(ROUTE_CACHE_LIFETIME.SECURITYTXT)), (_, res: express.Response) => { res.type('text/plain') return res.send(CONFIG.INSTANCE.SECURITYTXT + CONFIG.INSTANCE.SECURITYTXT_CONTACT) @@ -117,7 +135,7 @@ staticRouter.get('/.well-known/security.txt', // nodeinfo service staticRouter.use('/.well-known/nodeinfo', - asyncMiddleware(cacheRoute(ROUTE_CACHE_LIFETIME.NODEINFO)), + asyncMiddleware(cacheRoute()(ROUTE_CACHE_LIFETIME.NODEINFO)), (_, res: express.Response) => { return res.json({ links: [ @@ -130,13 +148,13 @@ staticRouter.use('/.well-known/nodeinfo', } ) staticRouter.use('/nodeinfo/:version.json', - asyncMiddleware(cacheRoute(ROUTE_CACHE_LIFETIME.NODEINFO)), + asyncMiddleware(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)), + asyncMiddleware(cacheRoute()(ROUTE_CACHE_LIFETIME.DNT_POLICY)), (_, res: express.Response) => { res.type('text/plain') @@ -214,7 +232,93 @@ async function generateNodeinfo (req: express.Request, res: express.Response) { postsName: 'Videos' }, nodeName: CONFIG.INSTANCE.NAME, - nodeDescription: CONFIG.INSTANCE.SHORT_DESCRIPTION + nodeDescription: CONFIG.INSTANCE.SHORT_DESCRIPTION, + nodeConfig: { + search: { + remoteUri: { + users: CONFIG.SEARCH.REMOTE_URI.USERS, + anonymous: CONFIG.SEARCH.REMOTE_URI.ANONYMOUS + } + }, + plugin: { + registered: getRegisteredPlugins() + }, + theme: { + registered: 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 + }, + webtorrent: { + enabled: CONFIG.TRANSCODING.WEBTORRENT.ENABLED + }, + enabledResolutions: getEnabledResolutions() + }, + import: { + videos: { + http: { + enabled: CONFIG.IMPORT.VIDEOS.HTTP.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.AVATAR.FILE_SIZE.max + }, + extensions: CONSTRAINTS_FIELDS.ACTORS.AVATAR.EXTNAME + } + }, + video: { + image: { + extensions: CONSTRAINTS_FIELDS.VIDEOS.IMAGE.EXTNAME, + size: { + max: CONSTRAINTS_FIELDS.VIDEOS.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 + } + }, + tracker: { + enabled: CONFIG.TRACKER.ENABLED + } + } } } as HttpNodeinfoDiasporaSoftwareNsSchema20 res.contentType('application/json; profile="http://nodeinfo.diaspora.software/ns/schema/2.0#"') @@ -226,25 +330,56 @@ async function generateNodeinfo (req: express.Request, res: express.Response) { return res.send(json).end() } -async function downloadTorrent (req: express.Request, res: express.Response) { - const { video, videoFile } = getVideoAndFile(req, res) +function downloadTorrent (req: express.Request, res: express.Response) { + const video = res.locals.videoAll + + const videoFile = getVideoFile(req, video.VideoFiles) if (!videoFile) return res.status(404).end() - return res.download(video.getTorrentFilePath(videoFile), `${video.name}-${videoFile.resolution}p.torrent`) + return res.download(getTorrentFilePath(video, videoFile), `${video.name}-${videoFile.resolution}p.torrent`) } -async function downloadVideoFile (req: express.Request, res: express.Response) { - const { video, videoFile } = getVideoAndFile(req, res) +function downloadHLSVideoFileTorrent (req: express.Request, res: express.Response) { + const video = res.locals.videoAll + + const playlist = getHLSPlaylist(video) + if (!playlist) return res.status(404).end + + const videoFile = getVideoFile(req, playlist.VideoFiles) if (!videoFile) return res.status(404).end() - return res.download(video.getVideoFilePath(videoFile), `${video.name}-${videoFile.resolution}p${videoFile.extname}`) + return res.download(getTorrentFilePath(playlist, videoFile), `${video.name}-${videoFile.resolution}p-hls.torrent`) } -function getVideoAndFile (req: express.Request, res: express.Response) { - const resolution = parseInt(req.params.resolution, 10) +function downloadVideoFile (req: express.Request, res: express.Response) { const video = res.locals.videoAll - const videoFile = video.VideoFiles.find(f => f.resolution === resolution) + const videoFile = getVideoFile(req, video.VideoFiles) + if (!videoFile) return res.status(404).end() + + return res.download(getVideoFilePath(video, videoFile), `${video.name}-${videoFile.resolution}p${videoFile.extname}`) +} + +function downloadHLSVideoFile (req: express.Request, res: express.Response) { + const video = res.locals.videoAll + const playlist = getHLSPlaylist(video) + if (!playlist) return res.status(404).end + + const videoFile = getVideoFile(req, playlist.VideoFiles) + if (!videoFile) return res.status(404).end() + + const filename = `${video.name}-${videoFile.resolution}p-${playlist.getStringType()}${videoFile.extname}` + return res.download(getVideoFilePath(playlist, videoFile), filename) +} + +function getVideoFile (req: express.Request, files: MVideoFile[]) { + const resolution = parseInt(req.params.resolution, 10) + return files.find(f => f.resolution === resolution) +} + +function getHLSPlaylist (video: MVideoFullLight) { + const playlist = video.VideoStreamingPlaylists.find(p => p.type === VideoStreamingPlaylistType.HLS) + if (!playlist) return undefined - return { video, videoFile } + return Object.assign(playlist, { Video: video }) }