X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fconstants.ts;h=1802257df1ee6af1fad19d472b477ff25d47ac2c;hb=84531547bc0934a2abda586d539f7455b455d488;hp=164de041e14dc531ffc6d73c2ab98e28a63d0ee2;hpb=ba881f0e3f60218b28abbb59d23118db5f97d5f8;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 164de041e..1802257df 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -1,34 +1,35 @@ -import { join } from 'path' +import { CronRepeatOptions, EveryRepeatOptions } from 'bull' import { randomBytes } from 'crypto' -import { ActivityPubActorType } from '../../shared/models/activitypub' -import { FollowState } from '../../shared/models/actors' +import { invert } from 'lodash' +import { join } from 'path' +import { randomInt } from '../../shared/core-utils/miscs/miscs' import { AbuseState, + JobType, VideoImportState, VideoPrivacy, - VideoTranscodingFPS, - JobType, VideoRateType, VideoResolution, - VideoState + VideoState, + VideoTranscodingFPS } from '../../shared/models' -// Do not use barrels, remain constants as independent as possible -import { isTestInstance, sanitizeHost, sanitizeUrl, root } from '../helpers/core-utils' +import { ActivityPubActorType } from '../../shared/models/activitypub' +import { FollowState } from '../../shared/models/actors' import { NSFWPolicyType } from '../../shared/models/videos/nsfw-policy.type' -import { invert } from 'lodash' -import { CronRepeatOptions, EveryRepeatOptions } from 'bull' import { VideoPlaylistPrivacy } from '../../shared/models/videos/playlist/video-playlist-privacy.model' import { VideoPlaylistType } from '../../shared/models/videos/playlist/video-playlist-type.model' +// Do not use barrels, remain constants as independent as possible +import { isTestInstance, root, sanitizeHost, sanitizeUrl } from '../helpers/core-utils' import { CONFIG, registerConfigChangedHandler } from './config' // --------------------------------------------------------------------------- -const LAST_MIGRATION_VERSION = 540 +const LAST_MIGRATION_VERSION = 635 // --------------------------------------------------------------------------- const API_VERSION = 'v1' -const PEERTUBE_VERSION = require(join(root(), 'package.json')).version +const PEERTUBE_VERSION: string = require(join(root(), 'package.json')).version const PAGINATION = { GLOBAL: { @@ -62,13 +63,16 @@ const SORTABLE_COLUMNS = { JOBS: [ 'createdAt' ], VIDEO_CHANNELS: [ 'id', 'name', 'updatedAt', 'createdAt' ], VIDEO_IMPORTS: [ 'createdAt' ], + VIDEO_COMMENT_THREADS: [ 'createdAt', 'totalReplies' ], + VIDEO_COMMENTS: [ 'createdAt' ], + VIDEO_RATES: [ 'createdAt' ], BLACKLISTS: [ 'id', 'name', 'duration', 'views', 'likes', 'dislikes', 'uuid', 'createdAt' ], FOLLOWERS: [ 'createdAt', 'state', 'score' ], FOLLOWING: [ 'createdAt', 'redundancyAllowed', 'state' ], - VIDEOS: [ 'name', 'duration', 'createdAt', 'publishedAt', 'originallyPublishedAt', 'views', 'likes', 'trending' ], + VIDEOS: [ 'name', 'duration', 'createdAt', 'publishedAt', 'originallyPublishedAt', 'views', 'likes', 'trending', 'hot', 'best' ], // Don't forget to update peertube-search-index with the same values VIDEOS_SEARCH: [ 'name', 'duration', 'createdAt', 'publishedAt', 'originallyPublishedAt', 'views', 'likes', 'match' ], @@ -81,7 +85,7 @@ const SORTABLE_COLUMNS = { USER_NOTIFICATIONS: [ 'createdAt', 'read' ], - VIDEO_PLAYLISTS: [ 'displayName', 'createdAt', 'updatedAt' ], + VIDEO_PLAYLISTS: [ 'name', 'displayName', 'createdAt', 'updatedAt' ], PLUGINS: [ 'name', 'createdAt', 'updatedAt' ], @@ -133,24 +137,27 @@ const JOB_ATTEMPTS: { [id in JobType]: number } = { 'activitypub-http-unicast': 5, 'activitypub-http-fetcher': 5, 'activitypub-follow': 5, + 'activitypub-cleaner': 1, 'video-file-import': 1, 'video-transcoding': 1, 'video-import': 1, 'email': 5, + 'actor-keys': 3, 'videos-views': 1, 'activitypub-refresher': 1, 'video-redundancy': 1, 'video-live-ending': 1 } -const JOB_CONCURRENCY: { [id in JobType]: number } = { +// Excluded keys are jobs that can be configured by admins +const JOB_CONCURRENCY: { [id in Exclude]: number } = { 'activitypub-http-broadcast': 1, 'activitypub-http-unicast': 5, 'activitypub-http-fetcher': 1, + 'activitypub-cleaner': 1, 'activitypub-follow': 1, 'video-file-import': 1, - 'video-transcoding': 1, - 'video-import': 1, 'email': 5, + 'actor-keys': 1, 'videos-views': 1, 'activitypub-refresher': 1, 'video-redundancy': 1, @@ -161,10 +168,12 @@ const JOB_TTL: { [id in JobType]: number } = { 'activitypub-http-unicast': 60000 * 10, // 10 minutes 'activitypub-http-fetcher': 1000 * 3600 * 10, // 10 hours 'activitypub-follow': 60000 * 10, // 10 minutes + 'activitypub-cleaner': 1000 * 3600, // 1 hour 'video-file-import': 1000 * 3600, // 1 hour 'video-transcoding': 1000 * 3600 * 48, // 2 days, transcoding could be long 'video-import': 1000 * 3600 * 2, // 2 hours 'email': 60000 * 10, // 10 minutes + 'actor-keys': 60000 * 20, // 20 minutes 'videos-views': undefined, // Unlimited 'activitypub-refresher': 60000 * 10, // 10 minutes 'video-redundancy': 1000 * 3600 * 3, // 3 hours @@ -172,13 +181,23 @@ const JOB_TTL: { [id in JobType]: number } = { } const REPEAT_JOBS: { [ id: string ]: EveryRepeatOptions | CronRepeatOptions } = { 'videos-views': { - cron: '1 * * * *' // At 1 minute past the hour + cron: randomInt(1, 20) + ' * * * *' // Between 1-20 minutes past the hour + }, + 'activitypub-cleaner': { + cron: '30 5 * * ' + randomInt(0, 7) // 1 time per week (random day) at 5:30 AM + } +} +const JOB_PRIORITY = { + TRANSCODING: { + OPTIMIZER: 10, + NEW_RESOLUTION: 100 } } -const BROADCAST_CONCURRENCY = 10 // How many requests in parallel we do in activitypub-http-broadcast job +const BROADCAST_CONCURRENCY = 30 // How many requests in parallel we do in activitypub-http-broadcast job +const AP_CLEANER_CONCURRENCY = 10 // How many requests in parallel we do in activitypub-cleaner job const CRAWL_REQUEST_CONCURRENCY = 1 // How many requests in parallel to fetch remote data (likes, shares...) -const JOB_REQUEST_TIMEOUT = 3000 // 3 seconds +const REQUEST_TIMEOUT = 7000 // 7 seconds const JOB_COMPLETED_LIFETIME = 60000 * 60 * 24 * 2 // 2 days const VIDEO_IMPORT_TIMEOUT = 1000 * 3600 // 1 hour @@ -188,9 +207,11 @@ const SCHEDULER_INTERVALS_MS = { updateVideos: 60000, // 1 minute youtubeDLUpdate: 60000 * 60 * 24, // 1 day checkPlugins: CONFIG.PLUGINS.INDEX.CHECK_LATEST_VERSIONS_INTERVAL, + checkPeerTubeVersion: 60000 * 60 * 24, // 1 day autoFollowIndexInstances: 60000 * 60 * 24, // 1 day removeOldViews: 60000 * 60 * 24, // 1 day - removeOldHistory: 60000 * 60 * 24 // 1 day + removeOldHistory: 60000 * 60 * 24, // 1 day + updateInboxStats: 1000 * 60// 1 minute } // --------------------------------------------------------------------------- @@ -253,7 +274,7 @@ const CONSTRAINTS_FIELDS = { DESCRIPTION: { min: 3, max: 10000 }, // Length SUPPORT: { min: 3, max: 1000 }, // Length IMAGE: { - EXTNAME: [ '.jpg', '.jpeg' ], + EXTNAME: [ '.png', '.jpg', '.jpeg', '.webp' ], FILE_SIZE: { max: 2 * 1024 * 1024 // 2MB } @@ -263,8 +284,6 @@ const CONSTRAINTS_FIELDS = { DURATION: { min: 0 }, // Number TAGS: { min: 0, max: 5 }, // Number of total tags TAG: { min: 2, max: 30 }, // Length - THUMBNAIL: { min: 2, max: 30 }, - THUMBNAIL_DATA: { min: 0, max: 20000 }, // Bytes VIEWS: { min: 0 }, LIKES: { min: 0 }, DISLIKES: { min: 0 }, @@ -286,8 +305,8 @@ const CONSTRAINTS_FIELDS = { PUBLIC_KEY: { min: 10, max: 5000 }, // Length PRIVATE_KEY: { min: 10, max: 5000 }, // Length URL: { min: 3, max: 2000 }, // Length - AVATAR: { - EXTNAME: [ '.png', '.jpeg', '.jpg' ], + IMAGE: { + EXTNAME: [ '.png', '.jpeg', '.jpg', '.gif', '.webp' ], FILE_SIZE: { max: 2 * 1024 * 1024 // 2MB } @@ -316,7 +335,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 = { @@ -336,8 +359,11 @@ const VIDEO_RATE_TYPES: { [ id: string ]: VideoRateType } = { } const FFMPEG_NICE: { [ id: string ]: number } = { - THUMBNAIL: 2, // 2 just for don't blocking servers - TRANSCODING: 15 + // parent process defaults to niceness = 0 + // reminder: lower = higher priority, max value is 19, lowest is -20 + LIVE: 5, // prioritize over VOD and THUMBNAIL + THUMBNAIL: 10, + VOD: 15 } const VIDEO_CATEGORIES = { @@ -425,6 +451,9 @@ const MIMETYPES = { 'audio/x-flac': '.flac', 'audio/flac': '.flac', '‎audio/aac': '.aac', + 'audio/m4a': '.m4a', + 'audio/mp4': '.m4a', + 'audio/x-m4a': '.m4a', 'audio/ac3': '.ac3' }, EXT_MIMETYPE: null as { [ id: string ]: string } @@ -437,6 +466,8 @@ const MIMETYPES = { IMAGE: { MIMETYPE_EXT: { 'image/png': '.png', + 'image/gif': '.gif', + 'image/webp': '.webp', 'image/jpg': '.jpg', 'image/jpeg': '.jpg' }, @@ -508,6 +539,10 @@ const HTTP_SIGNATURE = { HEADER_NAME: 'signature', ALGORITHM: 'rsa-sha256', HEADERS_TO_SIGN: [ '(request-target)', 'host', 'date', 'digest' ], + REQUIRED_HEADERS: { + ALL: [ '(request-target)', 'host', 'date' ], + POST: [ '(request-target)', 'host', 'date', 'digest' ] + }, CLOCK_SKEW_SECONDS: 1800 } @@ -533,16 +568,13 @@ const NSFW_POLICY_TYPES: { [ id: string ]: NSFWPolicyType } = { // Express static paths (router) const STATIC_PATHS = { - PREVIEWS: '/static/previews/', THUMBNAILS: '/static/thumbnails/', TORRENTS: '/static/torrents/', WEBSEED: '/static/webseed/', REDUNDANCY: '/static/redundancy/', STREAMING_PLAYLISTS: { HLS: '/static/streaming-playlists/hls' - }, - AVATARS: '/static/avatars/', - VIDEO_CAPTIONS: '/static/video-captions/' + } } const STATIC_DOWNLOAD_PATHS = { TORRENTS: '/download/torrents/', @@ -550,21 +582,24 @@ const STATIC_DOWNLOAD_PATHS = { HLS_VIDEOS: '/download/streaming-playlists/hls/videos/' } const LAZY_STATIC_PATHS = { + BANNERS: '/lazy-static/banners/', AVATARS: '/lazy-static/avatars/', PREVIEWS: '/lazy-static/previews/', - VIDEO_CAPTIONS: '/lazy-static/video-captions/' + VIDEO_CAPTIONS: '/lazy-static/video-captions/', + TORRENTS: '/lazy-static/torrents/' } // Cache control const STATIC_MAX_AGE = { SERVER: '2h', + LAZY_SERVER: '2d', CLIENT: '30d' } // Videos thumbnail size const THUMBNAILS_SIZE = { - width: 223, - height: 122, + width: 280, + height: 157, minWidth: 150 } const PREVIEWS_SIZE = { @@ -572,9 +607,15 @@ const PREVIEWS_SIZE = { height: 480, minWidth: 400 } -const AVATARS_SIZE = { - width: 120, - height: 120 +const ACTOR_IMAGES_SIZE = { + AVATARS: { + width: 120, + height: 120 + }, + BANNERS: { + width: 1920, + height: 317 // 6/1 ratio + } } const EMBED_SIZE = { @@ -591,6 +632,10 @@ const FILES_CACHE = { VIDEO_CAPTIONS: { DIRECTORY: join(CONFIG.STORAGE.CACHE_DIR, 'video-captions'), MAX_AGE: 1000 * 3600 * 3 // 3 hours + }, + TORRENTS: { + DIRECTORY: join(CONFIG.STORAGE.CACHE_DIR, 'torrents'), + MAX_AGE: 1000 * 3600 * 3 // 3 hours } } @@ -598,7 +643,7 @@ const LRU_CACHE = { USER_TOKENS: { MAX_SIZE: 1000 }, - AVATAR_STATIC: { + ACTOR_IMAGE_STATIC: { MAX_SIZE: 500 } } @@ -611,6 +656,9 @@ const VIDEO_LIVE = { CLEANUP_DELAY: 1000 * 60 * 5, // 5 minutes SEGMENT_TIME_SECONDS: 4, // 4 seconds SEGMENTS_LIST_SIZE: 15, // 15 maximum segments in live playlist + REPLAY_DIRECTORY: 'replay', + EDGE_LIVE_DELAY_SEGMENTS_NOTIFICATION: 4, + MAX_SOCKET_WAITING_DATA: 1024 * 1000 * 100, // 100MB RTMP: { CHUNK_SIZE: 60000, GOP_CACHE: true, @@ -623,7 +671,8 @@ const VIDEO_LIVE = { const MEMOIZE_TTL = { OVERVIEWS_SAMPLE: 1000 * 3600 * 4, // 4 hours INFO_HASH_EXISTS: 1000 * 3600 * 12, // 12 hours - LIVE_ABLE_TO_UPLOAD: 1000 * 60 // 1 minute + LIVE_ABLE_TO_UPLOAD: 1000 * 60, // 1 minute + LIVE_CHECK_SOCKET_HEALTH: 1000 * 60 // 1 minute } const MEMOIZE_LENGTH = { @@ -631,7 +680,7 @@ const MEMOIZE_LENGTH = { } const QUEUE_CONCURRENCY = { - AVATAR_PROCESS_IMAGE: 3 + ACTOR_PROCESS_IMAGE: 3 } const REDUNDANCY = { @@ -710,11 +759,12 @@ if (isTestInstance() === true) { STATIC_MAX_AGE.SERVER = '0' ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE = 2 - ACTIVITY_PUB.ACTOR_REFRESH_INTERVAL = 100 * 10000 // 10 seconds - ACTIVITY_PUB.VIDEO_REFRESH_INTERVAL = 100 * 10000 // 10 seconds - ACTIVITY_PUB.VIDEO_PLAYLIST_REFRESH_INTERVAL = 100 * 10000 // 10 seconds + ACTIVITY_PUB.ACTOR_REFRESH_INTERVAL = 10 * 1000 // 10 seconds + ACTIVITY_PUB.VIDEO_REFRESH_INTERVAL = 10 * 1000 // 10 seconds + ACTIVITY_PUB.VIDEO_PLAYLIST_REFRESH_INTERVAL = 10 * 1000 // 10 seconds - CONSTRAINTS_FIELDS.ACTORS.AVATAR.FILE_SIZE.max = 100 * 1024 // 100KB + CONSTRAINTS_FIELDS.ACTORS.IMAGE.FILE_SIZE.max = 100 * 1024 // 100KB + CONSTRAINTS_FIELDS.VIDEOS.IMAGE.FILE_SIZE.max = 400 * 1024 // 400KB SCHEDULER_INTERVALS_MS.actorFollowScores = 1000 SCHEDULER_INTERVALS_MS.removeOldJobs = 10000 @@ -722,11 +772,15 @@ if (isTestInstance() === true) { SCHEDULER_INTERVALS_MS.removeOldViews = 5000 SCHEDULER_INTERVALS_MS.updateVideos = 5000 SCHEDULER_INTERVALS_MS.autoFollowIndexInstances = 5000 + SCHEDULER_INTERVALS_MS.updateInboxStats = 5000 + SCHEDULER_INTERVALS_MS.checkPeerTubeVersion = 2000 REPEAT_JOBS['videos-views'] = { every: 5000 } + REPEAT_JOBS['activitypub-cleaner'] = { every: 5000 } 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 @@ -740,6 +794,7 @@ if (isTestInstance() === true) { VIDEO_LIVE.CLEANUP_DELAY = 5000 VIDEO_LIVE.SEGMENT_TIME_SECONDS = 2 + VIDEO_LIVE.EDGE_LIVE_DELAY_SEGMENTS_NOTIFICATION = 1 } updateWebserverUrls() @@ -769,7 +824,7 @@ export { SEARCH_INDEX, HLS_REDUNDANCY_DIRECTORY, P2P_MEDIA_LOADER_PEER_VERSION, - AVATARS_SIZE, + ACTOR_IMAGES_SIZE, ACCEPT_HEADERS, BCRYPT_SALT_SIZE, TRACKER_RATE_LIMITS, @@ -780,6 +835,7 @@ export { REDUNDANCY, JOB_CONCURRENCY, JOB_ATTEMPTS, + AP_CLEANER_CONCURRENCY, LAST_MIGRATION_VERSION, OAUTH_LIFETIME, CUSTOM_HTML_TAG_COMMENTS, @@ -818,12 +874,13 @@ export { VIDEO_STATES, QUEUE_CONCURRENCY, VIDEO_RATE_TYPES, + JOB_PRIORITY, VIDEO_TRANSCODING_FPS, FFMPEG_NICE, ABUSE_STATES, VIDEO_CHANNELS, LRU_CACHE, - JOB_REQUEST_TIMEOUT, + REQUEST_TIMEOUT, USER_PASSWORD_RESET_LIFETIME, USER_PASSWORD_CREATE_LIFETIME, MEMOIZE_TTL, @@ -838,7 +895,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, @@ -924,7 +981,6 @@ function updateWebserverUrls () { WEBSERVER.SCHEME = CONFIG.WEBSERVER.SCHEME WEBSERVER.HOSTNAME = CONFIG.WEBSERVER.HOSTNAME WEBSERVER.PORT = CONFIG.WEBSERVER.PORT - WEBSERVER.PORT = CONFIG.WEBSERVER.PORT WEBSERVER.RTMP_URL = 'rtmp://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.LIVE.RTMP.PORT + '/' + VIDEO_LIVE.RTMP.BASE_PATH }