X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fconstants.ts;h=97fd1bdc14cacb3f311187b8894aaa3995502405;hb=998440b6ecc92b6c0206256dae807a3946ffcef1;hp=ca6c2a7ffbb2ea6dc68d0d172ab7e760c47f3b74;hpb=d573926e9b94fb19c8f51c53f71fc853182e1761;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index ca6c2a7ff..97fd1bdc1 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -23,7 +23,7 @@ import { CONFIG, registerConfigChangedHandler } from './config' // --------------------------------------------------------------------------- -const LAST_MIGRATION_VERSION = 525 +const LAST_MIGRATION_VERSION = 545 // --------------------------------------------------------------------------- @@ -50,7 +50,8 @@ const WEBSERVER = { SCHEME: '', WS: '', HOSTNAME: '', - PORT: 0 + PORT: 0, + RTMP_URL: '' } // Sortable columns per schema @@ -138,7 +139,8 @@ const JOB_ATTEMPTS: { [id in JobType]: number } = { 'email': 5, 'videos-views': 1, 'activitypub-refresher': 1, - 'video-redundancy': 1 + 'video-redundancy': 1, + 'video-live-ending': 1 } const JOB_CONCURRENCY: { [id in JobType]: number } = { 'activitypub-http-broadcast': 1, @@ -151,7 +153,8 @@ const JOB_CONCURRENCY: { [id in JobType]: number } = { 'email': 5, 'videos-views': 1, 'activitypub-refresher': 1, - 'video-redundancy': 1 + 'video-redundancy': 1, + 'video-live-ending': 10 } const JOB_TTL: { [id in JobType]: number } = { 'activitypub-http-broadcast': 60000 * 10, // 10 minutes @@ -164,7 +167,8 @@ const JOB_TTL: { [id in JobType]: number } = { 'email': 60000 * 10, // 10 minutes 'videos-views': undefined, // Unlimited 'activitypub-refresher': 60000 * 10, // 10 minutes - 'video-redundancy': 1000 * 3600 * 3 // 3 hours + 'video-redundancy': 1000 * 3600 * 3, // 3 hours + 'video-live-ending': 1000 * 60 * 10 // 10 minutes } const REPEAT_JOBS: { [ id: string ]: EveryRepeatOptions | CronRepeatOptions } = { 'videos-views': { @@ -264,7 +268,7 @@ const CONSTRAINTS_FIELDS = { VIEWS: { min: 0 }, LIKES: { min: 0 }, DISLIKES: { min: 0 }, - FILE_SIZE: { min: 10 }, + FILE_SIZE: { min: -1 }, URL: { min: 3, max: 2000 } // Length }, VIDEO_PLAYLISTS: { @@ -312,7 +316,11 @@ const CONSTRAINTS_FIELDS = { } } -let VIDEO_VIEW_LIFETIME = 60000 * 60 // 1 hour +const VIEW_LIFETIME = { + VIDEO: 60000 * 60, // 1 hour + LIVE: 60000 * 5 // 5 minutes +} + let CONTACT_FORM_LIFETIME = 60000 * 60 // 1 hour const VIDEO_TRANSCODING_FPS: VideoTranscodingFPS = { @@ -370,39 +378,41 @@ const VIDEO_LICENCES = { const VIDEO_LANGUAGES: { [id: string]: string } = {} -const VIDEO_PRIVACIES = { +const VIDEO_PRIVACIES: { [ id in VideoPrivacy ]: string } = { [VideoPrivacy.PUBLIC]: 'Public', [VideoPrivacy.UNLISTED]: 'Unlisted', [VideoPrivacy.PRIVATE]: 'Private', [VideoPrivacy.INTERNAL]: 'Internal' } -const VIDEO_STATES = { +const VIDEO_STATES: { [ id in VideoState ]: string } = { [VideoState.PUBLISHED]: 'Published', [VideoState.TO_TRANSCODE]: 'To transcode', - [VideoState.TO_IMPORT]: 'To import' + [VideoState.TO_IMPORT]: 'To import', + [VideoState.WAITING_FOR_LIVE]: 'Waiting for livestream', + [VideoState.LIVE_ENDED]: 'Livestream ended' } -const VIDEO_IMPORT_STATES = { +const VIDEO_IMPORT_STATES: { [ id in VideoImportState ]: string } = { [VideoImportState.FAILED]: 'Failed', [VideoImportState.PENDING]: 'Pending', [VideoImportState.SUCCESS]: 'Success', [VideoImportState.REJECTED]: 'Rejected' } -const ABUSE_STATES = { +const ABUSE_STATES: { [ id in AbuseState ]: string } = { [AbuseState.PENDING]: 'Pending', [AbuseState.REJECTED]: 'Rejected', [AbuseState.ACCEPTED]: 'Accepted' } -const VIDEO_PLAYLIST_PRIVACIES = { +const VIDEO_PLAYLIST_PRIVACIES: { [ id in VideoPlaylistPrivacy ]: string } = { [VideoPlaylistPrivacy.PUBLIC]: 'Public', [VideoPlaylistPrivacy.UNLISTED]: 'Unlisted', [VideoPlaylistPrivacy.PRIVATE]: 'Private' } -const VIDEO_PLAYLIST_TYPES = { +const VIDEO_PLAYLIST_TYPES: { [ id in VideoPlaylistType ]: string } = { [VideoPlaylistType.REGULAR]: 'Regular', [VideoPlaylistType.WATCH_LATER]: 'Watch later' } @@ -417,12 +427,15 @@ const MIMETYPES = { 'audio/x-ms-wma': '.wma', 'audio/wav': '.wav', 'audio/x-flac': '.flac', - 'audio/flac': '.flac' + 'audio/flac': '.flac', + '‎audio/aac': '.aac', + 'audio/ac3': '.ac3' }, EXT_MIMETYPE: null as { [ id: string ]: string } }, VIDEO: { - MIMETYPE_EXT: null as { [ id: string ]: string }, + MIMETYPE_EXT: null as { [ id: string ]: string | string[] }, + MIMETYPES_REGEX: null as string, EXT_MIMETYPE: null as { [ id: string ]: string } }, IMAGE: { @@ -542,8 +555,8 @@ const STATIC_DOWNLOAD_PATHS = { } const LAZY_STATIC_PATHS = { AVATARS: '/lazy-static/avatars/', - PREVIEWS: '/static/previews/', - VIDEO_CAPTIONS: '/static/video-captions/' + PREVIEWS: '/lazy-static/previews/', + VIDEO_CAPTIONS: '/lazy-static/video-captions/' } // Cache control @@ -597,9 +610,24 @@ const LRU_CACHE = { const HLS_STREAMING_PLAYLIST_DIRECTORY = join(CONFIG.STORAGE.STREAMING_PLAYLISTS_DIR, 'hls') const HLS_REDUNDANCY_DIRECTORY = join(CONFIG.STORAGE.REDUNDANCY_DIR, 'hls') +const VIDEO_LIVE = { + EXTENSION: '.ts', + CLEANUP_DELAY: 1000 * 60 * 5, // 5 minutes + SEGMENT_TIME_SECONDS: 4, // 4 seconds + SEGMENTS_LIST_SIZE: 15, // 15 maximum segments in live playlist + RTMP: { + CHUNK_SIZE: 60000, + GOP_CACHE: true, + PING: 60, + PING_TIMEOUT: 30, + BASE_PATH: 'live' + } +} + const MEMOIZE_TTL = { OVERVIEWS_SAMPLE: 1000 * 3600 * 4, // 4 hours - INFO_HASH_EXISTS: 1000 * 3600 * 12 // 12 hours + INFO_HASH_EXISTS: 1000 * 3600 * 12, // 12 hours + LIVE_ABLE_TO_UPLOAD: 1000 * 60 // 1 minute } const MEMOIZE_LENGTH = { @@ -619,7 +647,8 @@ const REDUNDANCY = { const ACCEPT_HEADERS = [ 'html', 'application/json' ].concat(ACTIVITY_PUB.POTENTIAL_ACCEPT_HEADERS) const ASSETS_PATH = { - DEFAULT_AUDIO_BACKGROUND: join(root(), 'dist', 'server', 'assets', 'default-audio-background.jpg') + DEFAULT_AUDIO_BACKGROUND: join(root(), 'dist', 'server', 'assets', 'default-audio-background.jpg'), + DEFAULT_LIVE_BACKGROUND: join(root(), 'dist', 'server', 'assets', 'default-live-background.jpg') } // --------------------------------------------------------------------------- @@ -647,7 +676,7 @@ const TRACKER_RATE_LIMITS = { INTERVAL: 60000 * 5, // 5 minutes ANNOUNCES_PER_IP_PER_INFOHASH: 15, // maximum announces per torrent in the interval ANNOUNCES_PER_IP: 30, // maximum announces for all our torrents in the interval - BLOCK_IP_LIFETIME: 60000 * 10 // 10 minutes + BLOCK_IP_LIFETIME: 60000 * 3 // 3 minutes } const P2P_MEDIA_LOADER_PEER_VERSION = 2 @@ -701,16 +730,21 @@ if (isTestInstance() === true) { REDUNDANCY.VIDEOS.RANDOMIZED_FACTOR = 1 - VIDEO_VIEW_LIFETIME = 1000 // 1 second + VIEW_LIFETIME.VIDEO = 1000 // 1 second + VIEW_LIFETIME.LIVE = 1000 * 5 // 5 second CONTACT_FORM_LIFETIME = 1000 // 1 second JOB_ATTEMPTS['email'] = 1 FILES_CACHE.VIDEO_CAPTIONS.MAX_AGE = 3000 MEMOIZE_TTL.OVERVIEWS_SAMPLE = 3000 + MEMOIZE_TTL.LIVE_ABLE_TO_UPLOAD = 3000 OVERVIEWS.VIDEOS.SAMPLE_THRESHOLD = 2 PLUGIN_EXTERNAL_AUTH_TOKEN_LIFETIME = 5000 + + VIDEO_LIVE.CLEANUP_DELAY = 5000 + VIDEO_LIVE.SEGMENT_TIME_SECONDS = 2 } updateWebserverUrls() @@ -734,6 +768,7 @@ const FILES_CONTENT_HASH = { export { WEBSERVER, API_VERSION, + VIDEO_LIVE, PEERTUBE_VERSION, LAZY_STATIC_PATHS, SEARCH_INDEX, @@ -808,7 +843,7 @@ export { JOB_COMPLETED_LIFETIME, HTTP_SIGNATURE, VIDEO_IMPORT_STATES, - VIDEO_VIEW_LIFETIME, + VIEW_LIFETIME, CONTACT_FORM_LIFETIME, VIDEO_PLAYLIST_PRIVACIES, PLUGIN_EXTERNAL_AUTH_TOKEN_LIFETIME, @@ -823,23 +858,58 @@ export { function buildVideoMimetypeExt () { const data = { + // streamable formats that warrant cross-browser compatibility 'video/webm': '.webm', - 'video/ogg': '.ogv', + // We'll add .ogg if additional extensions are enabled + // We could add .ogg here but since it could be an audio file, + // it would be confusing for users because PeerTube will refuse their file (based on the mimetype) + 'video/ogg': [ '.ogv' ], 'video/mp4': '.mp4' } if (CONFIG.TRANSCODING.ENABLED) { if (CONFIG.TRANSCODING.ALLOW_ADDITIONAL_EXTENSIONS) { + data['video/ogg'].push('.ogg') + Object.assign(data, { - 'video/quicktime': '.mov', - 'video/x-msvideo': '.avi', - 'video/x-flv': '.flv', 'video/x-matroska': '.mkv', - 'video/avi': '.avi', + + // Developed by Apple + 'video/quicktime': [ '.mov', '.qt', '.mqv' ], // often used as output format by editing software 'video/x-m4v': '.m4v', + 'video/m4v': '.m4v', + + // Developed by the Adobe Flash Platform + 'video/x-flv': '.flv', + 'video/x-f4v': '.f4v', // replacement for flv + + // Developed by Microsoft + 'video/x-ms-wmv': '.wmv', + 'video/x-msvideo': '.avi', + 'video/avi': '.avi', + + // Developed by 3GPP + // common video formats for cell phones + 'video/3gpp': [ '.3gp', '.3gpp' ], + 'video/3gpp2': [ '.3g2', '.3gpp2' ], + + // Developed by FFmpeg/Mplayer + 'application/x-nut': '.nut', + + // The standard video format used by many Sony and Panasonic HD camcorders. + // It is also used for storing high definition video on Blu-ray discs. + 'video/mp2t': '.mts', + 'video/m2ts': '.m2ts', + + // Old formats reliant on MPEG-1/MPEG-2 + 'video/mpv': '.mpv', + 'video/mpeg2': '.m2v', + 'video/mpeg': [ '.m1v', '.mpg', '.mpe', '.mpeg', '.vob' ], + 'video/dvd': '.vob', + // Could be anything 'application/octet-stream': null, - 'video/m4v': '.m4v' + 'application/mxf': '.mxf' // often used as exchange format by editing software }) } @@ -854,22 +924,47 @@ function buildVideoMimetypeExt () { function updateWebserverUrls () { WEBSERVER.URL = sanitizeUrl(CONFIG.WEBSERVER.SCHEME + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT) WEBSERVER.HOST = sanitizeHost(CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT, REMOTE_SCHEME.HTTP) - WEBSERVER.SCHEME = CONFIG.WEBSERVER.SCHEME WEBSERVER.WS = CONFIG.WEBSERVER.WS + + WEBSERVER.SCHEME = CONFIG.WEBSERVER.SCHEME WEBSERVER.HOSTNAME = CONFIG.WEBSERVER.HOSTNAME WEBSERVER.PORT = CONFIG.WEBSERVER.PORT + + WEBSERVER.RTMP_URL = 'rtmp://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.LIVE.RTMP.PORT + '/' + VIDEO_LIVE.RTMP.BASE_PATH } function updateWebserverConfig () { MIMETYPES.VIDEO.MIMETYPE_EXT = buildVideoMimetypeExt() - MIMETYPES.VIDEO.EXT_MIMETYPE = invert(MIMETYPES.VIDEO.MIMETYPE_EXT) + MIMETYPES.VIDEO.MIMETYPES_REGEX = buildMimetypesRegex(MIMETYPES.VIDEO.MIMETYPE_EXT) + ACTIVITY_PUB.URL_MIME_TYPES.VIDEO = Object.keys(MIMETYPES.VIDEO.MIMETYPE_EXT) - CONSTRAINTS_FIELDS.VIDEOS.EXTNAME = buildVideosExtname() + MIMETYPES.VIDEO.EXT_MIMETYPE = buildVideoExtMimetype(MIMETYPES.VIDEO.MIMETYPE_EXT) + + CONSTRAINTS_FIELDS.VIDEOS.EXTNAME = Object.keys(MIMETYPES.VIDEO.EXT_MIMETYPE) } -function buildVideosExtname () { - return Object.keys(MIMETYPES.VIDEO.EXT_MIMETYPE) +function buildVideoExtMimetype (obj: { [ id: string ]: string | string[] }) { + const result: { [id: string]: string } = {} + + for (const mimetype of Object.keys(obj)) { + const value = obj[mimetype] + if (!value) continue + + const extensions = Array.isArray(value) ? value : [ value ] + + for (const extension of extensions) { + result[extension] = mimetype + } + } + + return result +} + +function buildMimetypesRegex (obj: { [id: string]: string | string[] }) { + return Object.keys(obj) + .map(m => `(${m})`) + .join('|') } function loadLanguages () { @@ -896,7 +991,9 @@ function buildLanguages () { jsl: true, // Japanese sign language sfs: true, // South African sign language swl: true, // Swedish sign language - rsl: true, // Russian sign language: true + rsl: true, // Russian sign language + + kab: true, // Kabyle epo: true, // Esperanto tlh: true, // Klingon