X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fconstants.ts;h=97fd1bdc14cacb3f311187b8894aaa3995502405;hb=998440b6ecc92b6c0206256dae807a3946ffcef1;hp=606eeba2d5c1812e5c7f67400871d0d91a16591d;hpb=c6c0fa6cd8fe8f752463d8982c3dbcd448739c4e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 606eeba2d..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 = 540 +const LAST_MIGRATION_VERSION = 545 // --------------------------------------------------------------------------- @@ -139,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, @@ -152,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 @@ -165,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': { @@ -313,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 = { @@ -605,6 +612,9 @@ 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, @@ -616,7 +626,8 @@ const VIDEO_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 = { @@ -665,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 @@ -703,9 +714,9 @@ 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 @@ -719,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() @@ -827,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, @@ -913,7 +929,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 }