import { randomBytes } from 'crypto'
import { invert } from 'lodash'
import { join } from 'path'
-import { randomInt } from '../../shared/core-utils/miscs/miscs'
+import { randomInt, root } from '@shared/core-utils'
import {
AbuseState,
JobType,
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 { isTestInstance, sanitizeHost, sanitizeUrl } from '../helpers/core-utils'
import { CONFIG, registerConfigChangedHandler } from './config'
// ---------------------------------------------------------------------------
-const LAST_MIGRATION_VERSION = 625
+const LAST_MIGRATION_VERSION = 675
// ---------------------------------------------------------------------------
WS: '',
HOSTNAME: '',
PORT: 0,
- RTMP_URL: ''
+ RTMP_URL: '',
+ RTMPS_URL: ''
}
// Sortable columns per schema
VIDEO_RATES: [ 'createdAt' ],
BLACKLISTS: [ 'id', 'name', 'duration', 'views', 'likes', 'dislikes', 'uuid', 'createdAt' ],
- FOLLOWERS: [ 'createdAt', 'state', 'score' ],
- FOLLOWING: [ 'createdAt', 'redundancyAllowed', 'state' ],
+
+ INSTANCE_FOLLOWERS: [ 'createdAt', 'state', 'score' ],
+ INSTANCE_FOLLOWING: [ 'createdAt', 'redundancyAllowed', 'state' ],
+ ACCOUNT_FOLLOWERS: [ 'createdAt' ],
+ CHANNEL_FOLLOWERS: [ 'createdAt' ],
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' ],
VIDEO_CHANNELS_SEARCH: [ 'match', 'displayName', 'createdAt' ],
+ VIDEO_PLAYLISTS_SEARCH: [ 'match', 'displayName', 'createdAt' ],
ABUSES: [ 'id', 'createdAt', 'state' ],
}
const JOB_ATTEMPTS: { [id in JobType]: number } = {
- 'activitypub-http-broadcast': 5,
- 'activitypub-http-unicast': 5,
- 'activitypub-http-fetcher': 5,
+ 'activitypub-http-broadcast': 1,
+ 'activitypub-http-unicast': 1,
+ 'activitypub-http-fetcher': 2,
'activitypub-follow': 5,
'activitypub-cleaner': 1,
'video-file-import': 1,
'video-import': 1,
'email': 5,
'actor-keys': 3,
- 'videos-views': 1,
+ 'videos-views-stats': 1,
'activitypub-refresher': 1,
'video-redundancy': 1,
- 'video-live-ending': 1
+ 'video-live-ending': 1,
+ 'move-to-object-storage': 3
}
// Excluded keys are jobs that can be configured by admins
const JOB_CONCURRENCY: { [id in Exclude<JobType, 'video-transcoding' | 'video-import'>]: number } = {
'activitypub-http-broadcast': 1,
- 'activitypub-http-unicast': 5,
- 'activitypub-http-fetcher': 1,
+ 'activitypub-http-unicast': 10,
+ 'activitypub-http-fetcher': 3,
'activitypub-cleaner': 1,
'activitypub-follow': 1,
'video-file-import': 1,
'email': 5,
'actor-keys': 1,
- 'videos-views': 1,
+ 'videos-views-stats': 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
'video-import': 1000 * 3600 * 2, // 2 hours
'email': 60000 * 10, // 10 minutes
'actor-keys': 60000 * 20, // 20 minutes
- 'videos-views': undefined, // Unlimited
+ 'videos-views-stats': 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': {
+const REPEAT_JOBS: { [ id in JobType ]?: EveryRepeatOptions | CronRepeatOptions } = {
+ 'videos-views-stats': {
cron: randomInt(1, 20) + ' * * * *' // Between 1-20 minutes past the hour
},
'activitypub-cleaner': {
}
}
const JOB_PRIORITY = {
- TRANSCODING: {
- OPTIMIZER: 10,
- NEW_RESOLUTION: 100
- }
+ TRANSCODING: 100
}
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 REQUEST_TIMEOUT = 7000 // 7 seconds
+const REQUEST_TIMEOUTS = {
+ DEFAULT: 7000, // 7 seconds
+ FILE: 30000, // 30 seconds
+ REDUNDANCY: JOB_TTL['video-redundancy']
+}
+
const JOB_COMPLETED_LIFETIME = 60000 * 60 * 24 * 2 // 2 days
const VIDEO_IMPORT_TIMEOUT = 1000 * 3600 // 1 hour
const SCHEDULER_INTERVALS_MS = {
- actorFollowScores: 60000 * 60, // 1 hour
- removeOldJobs: 60000 * 60, // 1 hour
- 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
+ ACTOR_FOLLOW_SCORES: 60000 * 60, // 1 hour
+ REMOVE_OLD_JOBS: 60000 * 60, // 1 hour
+ UPDATE_VIDEOS: 60000, // 1 minute
+ YOUTUBE_DL_UPDATE: 60000 * 60 * 24, // 1 day
+ VIDEO_VIEWS_BUFFER_UPDATE: CONFIG.VIEWS.VIDEOS.LOCAL_BUFFER_UPDATE_INTERVAL,
+ CHECK_PLUGINS: CONFIG.PLUGINS.INDEX.CHECK_LATEST_VERSIONS_INTERVAL,
+ CHECK_PEERTUBE_VERSION: 60000 * 60 * 24, // 1 day
+ AUTO_FOLLOW_INDEX_INSTANCES: 60000 * 60 * 24, // 1 day
+ REMOVE_OLD_VIEWS: 60000 * 60 * 24, // 1 day
+ REMOVE_OLD_HISTORY: 60000 * 60 * 24, // 1 day
+ UPDATE_INBOX_STATS: 1000 * 60, // 1 minute
+ REMOVE_DANGLING_RESUMABLE_UPLOADS: 60000 * 60 // 1 hour
}
// ---------------------------------------------------------------------------
CAPTION_FILE: {
EXTNAME: [ '.vtt', '.srt' ],
FILE_SIZE: {
- max: 2 * 1024 * 1024 // 2MB
+ max: 4 * 1024 * 1024 // 4MB
}
}
},
IMAGE: {
EXTNAME: [ '.png', '.jpg', '.jpeg', '.webp' ],
FILE_SIZE: {
- max: 2 * 1024 * 1024 // 2MB
+ max: 4 * 1024 * 1024 // 4MB
}
},
EXTNAME: [] as string[],
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: {
IMAGE: {
EXTNAME: [ '.jpg', '.jpeg' ],
FILE_SIZE: {
- max: 2 * 1024 * 1024 // 2MB
+ max: 4 * 1024 * 1024 // 4MB
}
}
},
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
}
}
},
}
const VIEW_LIFETIME = {
- VIDEO: 60000 * 60, // 1 hour
- LIVE: 60000 * 5 // 5 minutes
+ VIEW: CONFIG.VIEWS.VIDEOS.IP_VIEW_EXPIRATION,
+ VIEWER: 60000 * 5 // 5 minutes
}
let CONTACT_FORM_LIFETIME = 60000 * 60 // 1 hour
const VIDEO_TRANSCODING_FPS: VideoTranscodingFPS = {
- MIN: 10,
+ MIN: 1,
STANDARD: [ 24, 25, 30 ],
HD_STANDARD: [ 50, 60 ],
AVERAGE: 30,
[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',
+ [VideoState.TRANSCODING_FAILED]: 'Transcoding failed',
+ [VideoState.TO_MOVE_TO_EXTERNAL_STORAGE_FAILED]: 'External storage move failed'
}
const VIDEO_IMPORT_STATES: { [ id in VideoImportState ]: string } = {
'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',
IMAGE: {
MIMETYPE_EXT: {
'image/png': '.png',
+ 'image/gif': '.gif',
+ 'image/webp': '.webp',
'image/jpg': '.jpg',
'image/jpeg': '.jpg'
},
MIMETYPES.AUDIO.EXT_MIMETYPE = invert(MIMETYPES.AUDIO.MIMETYPE_EXT)
MIMETYPES.IMAGE.EXT_MIMETYPE = invert(MIMETYPES.IMAGE.MIMETYPE_EXT)
+const BINARY_CONTENT_TYPES = new Set([
+ 'binary/octet-stream',
+ 'application/octet-stream',
+ 'application/x-binary'
+])
+
// ---------------------------------------------------------------------------
const OVERVIEWS = {
}
}
-const VIDEO_CHANNELS = {
- MAX_PER_USER: 20
-}
-
// ---------------------------------------------------------------------------
const SERVER_ACTOR_NAME = 'peertube'
// Express static paths (router)
const STATIC_PATHS = {
THUMBNAILS: '/static/thumbnails/',
- TORRENTS: '/static/torrents/',
WEBSEED: '/static/webseed/',
REDUNDANCY: '/static/redundancy/',
STREAMING_PLAYLISTS: {
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/',
// Videos thumbnail size
const THUMBNAILS_SIZE = {
- width: 223,
- height: 122,
+ width: 280,
+ height: 157,
minWidth: 150
}
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 = {
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')
+const RESUMABLE_UPLOAD_SESSION_LIFETIME = SCHEDULER_INTERVALS_MS.REMOVE_DANGLING_RESUMABLE_UPLOADS
+
const VIDEO_LIVE = {
EXTENSION: '.ts',
CLEANUP_DELAY: 1000 * 60 * 5, // 5 minutes
}
const QUEUE_CONCURRENCY = {
- AVATAR_PROCESS_IMAGE: 3
+ ACTOR_PROCESS_IMAGE: 3
}
const REDUNDANCY = {
TITLE: '<!-- title tag -->',
DESCRIPTION: '<!-- description tag -->',
CUSTOM_CSS: '<!-- custom css tag -->',
- META_TAGS: '<!-- meta tags -->'
+ META_TAGS: '<!-- meta tags -->',
+ SERVER_CONFIG: '<!-- server config -->'
}
// ---------------------------------------------------------------------------
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
- SCHEDULER_INTERVALS_MS.removeOldHistory = 5000
- 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 }
+ SCHEDULER_INTERVALS_MS.ACTOR_FOLLOW_SCORES = 1000
+ SCHEDULER_INTERVALS_MS.REMOVE_OLD_JOBS = 10000
+ SCHEDULER_INTERVALS_MS.REMOVE_OLD_HISTORY = 5000
+ SCHEDULER_INTERVALS_MS.REMOVE_OLD_VIEWS = 5000
+ SCHEDULER_INTERVALS_MS.UPDATE_VIDEOS = 5000
+ SCHEDULER_INTERVALS_MS.AUTO_FOLLOW_INDEX_INSTANCES = 5000
+ SCHEDULER_INTERVALS_MS.UPDATE_INBOX_STATS = 5000
+ SCHEDULER_INTERVALS_MS.CHECK_PEERTUBE_VERSION = 2000
+ REPEAT_JOBS['videos-views-stats'] = { every: 5000 }
REPEAT_JOBS['activitypub-cleaner'] = { every: 5000 }
REDUNDANCY.VIDEOS.RANDOMIZED_FACTOR = 1
- VIEW_LIFETIME.VIDEO = 1000 // 1 second
- VIEW_LIFETIME.LIVE = 1000 * 5 // 5 second
+ VIEW_LIFETIME.VIEWER = 1000 * 5 // 5 second
CONTACT_FORM_LIFETIME = 1000 // 1 second
JOB_ATTEMPTS['email'] = 1
PEERTUBE_VERSION,
LAZY_STATIC_PATHS,
SEARCH_INDEX,
+ RESUMABLE_UPLOAD_DIRECTORY,
+ RESUMABLE_UPLOAD_SESSION_LIFETIME,
HLS_REDUNDANCY_DIRECTORY,
P2P_MEDIA_LOADER_PEER_VERSION,
- AVATARS_SIZE,
+ ACTOR_IMAGES_SIZE,
ACCEPT_HEADERS,
BCRYPT_SALT_SIZE,
TRACKER_RATE_LIMITS,
VIDEO_TRANSCODING_FPS,
FFMPEG_NICE,
ABUSE_STATES,
- VIDEO_CHANNELS,
LRU_CACHE,
- REQUEST_TIMEOUT,
+ REQUEST_TIMEOUTS,
USER_PASSWORD_RESET_LIFETIME,
USER_PASSWORD_CREATE_LIFETIME,
MEMOIZE_TTL,
MIMETYPES,
CRAWL_REQUEST_CONCURRENCY,
DEFAULT_AUDIO_RESOLUTION,
+ BINARY_CONTENT_TYPES,
JOB_COMPLETED_LIFETIME,
HTTP_SIGNATURE,
VIDEO_IMPORT_STATES,
WEBSERVER.PORT = CONFIG.WEBSERVER.PORT
WEBSERVER.RTMP_URL = 'rtmp://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.LIVE.RTMP.PORT + '/' + VIDEO_LIVE.RTMP.BASE_PATH
+ WEBSERVER.RTMPS_URL = 'rtmps://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.LIVE.RTMPS.PORT + '/' + VIDEO_LIVE.RTMP.BASE_PATH
}
function updateWebserverConfig () {
kab: true, // Kabyle
+ lat: true, // Latin
+
epo: true, // Esperanto
tlh: true, // Klingon
jbo: true, // Lojban
- avk: true // Kotava
+ avk: true, // Kotava
+
+ zxx: true // No linguistic content (ISO-639-2)
}
// Only add ISO639-1 languages and some sign languages (ISO639-3)
projects / github / Chocobozzz / PeerTube.git / blobdiff