X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fconstants.ts;h=8a1526ae88d2b322bf9bb8b9d80a81762665868e;hb=5a298a5a3d000f94c944d3711d4b0226a888df04;hp=bbf55d7a4de1512dfb880214a7d61d8ba77eac20;hpb=23ac334389a6b11ba0656a18ff760fb45f7bec57;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index bbf55d7a4..8a1526ae8 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -1,8 +1,8 @@ -import { randomInt } from '../../shared/core-utils/miscs/miscs' import { CronRepeatOptions, EveryRepeatOptions } from 'bull' import { randomBytes } from 'crypto' import { invert } from 'lodash' import { join } from 'path' +import { randomInt } from '../../shared/core-utils/common/miscs' import { AbuseState, JobType, @@ -24,12 +24,12 @@ import { CONFIG, registerConfigChangedHandler } from './config' // --------------------------------------------------------------------------- -const LAST_MIGRATION_VERSION = 600 +const LAST_MIGRATION_VERSION = 660 // --------------------------------------------------------------------------- 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: { @@ -77,6 +77,7 @@ const SORTABLE_COLUMNS = { // Don't forget to update peertube-search-index with the same values VIDEOS_SEARCH: [ 'name', 'duration', 'createdAt', 'publishedAt', 'originallyPublishedAt', 'views', 'likes', 'match' ], VIDEO_CHANNELS_SEARCH: [ 'match', 'displayName', 'createdAt' ], + VIDEO_PLAYLISTS_SEARCH: [ 'match', 'displayName', 'createdAt' ], ABUSES: [ 'id', 'createdAt', 'state' ], @@ -137,56 +138,67 @@ 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 + 'video-live-ending': 1, + 'move-to-object-storage': 3 } -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-http-fetcher': 3, + 'activitypub-cleaner': 1, 'activitypub-follow': 1, 'video-file-import': 1, 'email': 5, + 'actor-keys': 1, 'videos-views': 1, 'activitypub-refresher': 1, 'video-redundancy': 1, - 'video-live-ending': 10 + 'video-live-ending': 10, + 'move-to-object-storage': 1 } const JOB_TTL: { [id in JobType]: number } = { 'activitypub-http-broadcast': 60000 * 10, // 10 minutes '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 - 'video-live-ending': 1000 * 60 * 10 // 10 minutes + 'video-live-ending': 1000 * 60 * 10, // 10 minutes + 'move-to-object-storage': 1000 * 60 * 60 * 3 // 3 hours } const REPEAT_JOBS: { [ id: string ]: EveryRepeatOptions | CronRepeatOptions } = { 'videos-views': { 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 - } + TRANSCODING: 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 = 7000 // 7 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 @@ -196,10 +208,12 @@ 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 - updateInboxStats: 1000 * 60// 1 minute + updateInboxStats: 1000 * 60, // 1 minute + removeDanglingResumableUploads: 60000 * 60 * 16 // 16 hours } // --------------------------------------------------------------------------- @@ -235,7 +249,7 @@ const CONSTRAINTS_FIELDS = { CAPTION_FILE: { EXTNAME: [ '.vtt', '.srt' ], FILE_SIZE: { - max: 2 * 1024 * 1024 // 2MB + max: 4 * 1024 * 1024 // 4MB } } }, @@ -264,7 +278,7 @@ const CONSTRAINTS_FIELDS = { IMAGE: { EXTNAME: [ '.png', '.jpg', '.jpeg', '.webp' ], FILE_SIZE: { - max: 2 * 1024 * 1024 // 2MB + max: 4 * 1024 * 1024 // 4MB } }, EXTNAME: [] as string[], @@ -276,6 +290,7 @@ const CONSTRAINTS_FIELDS = { LIKES: { min: 0 }, DISLIKES: { min: 0 }, FILE_SIZE: { min: -1 }, + PARTIAL_UPLOAD_SIZE: { max: 50 * 1024 * 1024 * 1024 }, // 50GB URL: { min: 3, max: 2000 } // Length }, VIDEO_PLAYLISTS: { @@ -285,7 +300,7 @@ const CONSTRAINTS_FIELDS = { IMAGE: { EXTNAME: [ '.jpg', '.jpeg' ], FILE_SIZE: { - max: 2 * 1024 * 1024 // 2MB + max: 4 * 1024 * 1024 // 4MB } } }, @@ -293,10 +308,10 @@ const CONSTRAINTS_FIELDS = { PUBLIC_KEY: { min: 10, max: 5000 }, // Length PRIVATE_KEY: { min: 10, max: 5000 }, // Length URL: { min: 3, max: 2000 }, // Length - AVATAR: { + IMAGE: { EXTNAME: [ '.png', '.jpeg', '.jpg', '.gif', '.webp' ], FILE_SIZE: { - max: 2 * 1024 * 1024 // 2MB + max: 4 * 1024 * 1024 // 4MB } } }, @@ -400,7 +415,8 @@ const VIDEO_STATES: { [ id in VideoState ]: string } = { [VideoState.TO_TRANSCODE]: 'To transcode', [VideoState.TO_IMPORT]: 'To import', [VideoState.WAITING_FOR_LIVE]: 'Waiting for livestream', - [VideoState.LIVE_ENDED]: 'Livestream ended' + [VideoState.LIVE_ENDED]: 'Livestream ended', + [VideoState.TO_MOVE_TO_EXTERNAL_STORAGE]: 'To move to an external storage' } const VIDEO_IMPORT_STATES: { [ id in VideoImportState ]: string } = { @@ -436,9 +452,10 @@ const MIMETYPES = { 'audio/ogg': '.ogg', 'audio/x-ms-wma': '.wma', 'audio/wav': '.wav', + 'audio/x-wav': '.wav', 'audio/x-flac': '.flac', 'audio/flac': '.flac', - '‎audio/aac': '.aac', + 'audio/aac': '.aac', 'audio/m4a': '.m4a', 'audio/mp4': '.m4a', 'audio/x-m4a': '.m4a', @@ -454,6 +471,8 @@ const MIMETYPES = { IMAGE: { MIMETYPE_EXT: { 'image/png': '.png', + 'image/gif': '.gif', + 'image/webp': '.webp', 'image/jpg': '.jpg', 'image/jpeg': '.jpg' }, @@ -568,6 +587,7 @@ 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/', @@ -583,8 +603,8 @@ const STATIC_MAX_AGE = { // Videos thumbnail size const THUMBNAILS_SIZE = { - width: 223, - height: 122, + width: 280, + height: 157, minWidth: 150 } const PREVIEWS_SIZE = { @@ -592,9 +612,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 = { @@ -622,11 +648,12 @@ const LRU_CACHE = { USER_TOKENS: { MAX_SIZE: 1000 }, - AVATAR_STATIC: { + ACTOR_IMAGE_STATIC: { MAX_SIZE: 500 } } +const RESUMABLE_UPLOAD_DIRECTORY = join(CONFIG.STORAGE.TMP_DIR, 'resumable-uploads') const HLS_STREAMING_PLAYLIST_DIRECTORY = join(CONFIG.STORAGE.STREAMING_PLAYLISTS_DIR, 'hls') const HLS_REDUNDANCY_DIRECTORY = join(CONFIG.STORAGE.REDUNDANCY_DIR, 'hls') @@ -659,7 +686,7 @@ const MEMOIZE_LENGTH = { } const QUEUE_CONCURRENCY = { - AVATAR_PROCESS_IMAGE: 3 + ACTOR_PROCESS_IMAGE: 3 } const REDUNDANCY = { @@ -681,7 +708,8 @@ const CUSTOM_HTML_TAG_COMMENTS = { TITLE: '', DESCRIPTION: '', CUSTOM_CSS: '', - META_TAGS: '' + META_TAGS: '', + SERVER_CONFIG: '' } // --------------------------------------------------------------------------- @@ -742,7 +770,7 @@ if (isTestInstance() === true) { 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 @@ -752,7 +780,9 @@ if (isTestInstance() === true) { 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 @@ -799,9 +829,10 @@ export { PEERTUBE_VERSION, LAZY_STATIC_PATHS, SEARCH_INDEX, + RESUMABLE_UPLOAD_DIRECTORY, HLS_REDUNDANCY_DIRECTORY, P2P_MEDIA_LOADER_PEER_VERSION, - AVATARS_SIZE, + ACTOR_IMAGES_SIZE, ACCEPT_HEADERS, BCRYPT_SALT_SIZE, TRACKER_RATE_LIMITS, @@ -812,6 +843,7 @@ export { REDUNDANCY, JOB_CONCURRENCY, JOB_ATTEMPTS, + AP_CLEANER_CONCURRENCY, LAST_MIGRATION_VERSION, OAUTH_LIFETIME, CUSTOM_HTML_TAG_COMMENTS, @@ -856,7 +888,7 @@ export { ABUSE_STATES, VIDEO_CHANNELS, LRU_CACHE, - JOB_REQUEST_TIMEOUT, + REQUEST_TIMEOUT, USER_PASSWORD_RESET_LIFETIME, USER_PASSWORD_CREATE_LIFETIME, MEMOIZE_TTL,