X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fconstants.ts;h=4a88aef87153fd471c8aec656ee10c603cd24895;hb=d3e56c0c4b307c99e83fbafb7f2c5884cbc20055;hp=aa243859cc6a2bab9662d9de29f9bbc28a62cc57;hpb=04b8c3fba614efc3827f583096c78b08cb668470;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index aa243859c..4a88aef87 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -16,7 +16,7 @@ let config: IConfig = require('config') // --------------------------------------------------------------------------- -const LAST_MIGRATION_VERSION = 290 +const LAST_MIGRATION_VERSION = 315 // --------------------------------------------------------------------------- @@ -50,7 +50,9 @@ const SORTABLE_COLUMNS = { VIDEO_CHANNELS_SEARCH: [ 'match', 'displayName', 'createdAt' ], ACCOUNTS_BLOCKLIST: [ 'createdAt' ], - SERVERS_BLOCKLIST: [ 'createdAt' ] + SERVERS_BLOCKLIST: [ 'createdAt' ], + + USER_NOTIFICATIONS: [ 'createdAt' ] } const OAUTH_LIFETIME = { @@ -61,6 +63,7 @@ const OAUTH_LIFETIME = { const ROUTE_CACHE_LIFETIME = { FEEDS: '15 minutes', ROBOTS: '2 hours', + SITEMAP: '1 day', SECURITYTXT: '2 hours', NODEINFO: '10 minutes', DNT_POLICY: '1 week', @@ -143,7 +146,7 @@ const VIDEO_IMPORT_TIMEOUT = 1000 * 3600 // 1 hour // 1 hour let SCHEDULER_INTERVALS_MS = { - badActorFollow: 60000 * 60, // 1 hour + actorFollowScores: 60000 * 60, // 1 hour removeOldJobs: 60000 * 60, // 1 hour updateVideos: 60000, // 1 minute youtubeDLUpdate: 60000 * 60 * 24 // 1 day @@ -185,9 +188,11 @@ const CONFIG = { FROM_ADDRESS: config.get('smtp.from_address') }, STORAGE: { + TMP_DIR: buildPath(config.get('storage.tmp')), AVATARS_DIR: buildPath(config.get('storage.avatars')), LOG_DIR: buildPath(config.get('storage.logs')), VIDEOS_DIR: buildPath(config.get('storage.videos')), + REDUNDANCY_DIR: buildPath(config.get('storage.redundancy')), THUMBNAILS_DIR: buildPath(config.get('storage.thumbnails')), PREVIEWS_DIR: buildPath(config.get('storage.previews')), CAPTIONS_DIR: buildPath(config.get('storage.captions')), @@ -226,6 +231,9 @@ const CONFIG = { ADMIN: { get EMAIL () { return config.get('admin.email') } }, + CONTACT_FORM: { + get ENABLED () { return config.get('contact_form.enabled') } + }, SIGNUP: { get ENABLED () { return config.get('signup.enabled') }, get LIMIT () { return config.get('signup.limit') }, @@ -243,6 +251,7 @@ const CONFIG = { }, TRANSCODING: { get ENABLED () { return config.get('transcoding.enabled') }, + get ALLOW_ADDITIONAL_EXTENSIONS () { return config.get('transcoding.allow_additional_extensions') }, get THREADS () { return config.get('transcoding.threads') }, RESOLUTIONS: { get '240p' () { return config.get('transcoding.resolutions.240p') }, @@ -286,6 +295,7 @@ const CONFIG = { get SECURITYTXT_CONTACT () { return config.get('admin.email') } }, SERVICES: { + get 'CSP-LOGGER' () { return config.get('services.csp-logger') }, TWITTER: { get USERNAME () { return config.get('services.twitter.username') }, get WHITELISTED () { return config.get('services.twitter.whitelisted') } @@ -295,11 +305,11 @@ const CONFIG = { // --------------------------------------------------------------------------- -const CONSTRAINTS_FIELDS = { +let CONSTRAINTS_FIELDS = { USERS: { - NAME: { min: 3, max: 120 }, // Length + NAME: { min: 1, max: 120 }, // Length DESCRIPTION: { min: 3, max: 1000 }, // Length - USERNAME: { min: 3, max: 20 }, // Length + USERNAME: { min: 1, max: 50 }, // Length PASSWORD: { min: 6, max: 255 }, // Length VIDEO_QUOTA: { min: -1 }, VIDEO_QUOTA_DAILY: { min: -1 }, @@ -313,7 +323,7 @@ const CONSTRAINTS_FIELDS = { REASON: { min: 2, max: 300 } // Length }, VIDEO_CHANNELS: { - NAME: { min: 3, max: 120 }, // Length + NAME: { min: 1, max: 120 }, // Length DESCRIPTION: { min: 3, max: 1000 }, // Length SUPPORT: { min: 3, max: 1000 }, // Length URL: { min: 3, max: 2000 } // Length @@ -354,7 +364,7 @@ const CONSTRAINTS_FIELDS = { max: 2 * 1024 * 1024 // 2MB } }, - EXTNAME: [ '.mp4', '.ogv', '.webm' ], + EXTNAME: buildVideosExtname(), INFO_HASH: { min: 40, max: 40 }, // Length, info hash is 20 bytes length but we represent it in hexadecimal so 20 * 2 DURATION: { min: 0 }, // Number TAGS: { min: 0, max: 5 }, // Number of total tags @@ -387,6 +397,10 @@ const CONSTRAINTS_FIELDS = { }, VIDEO_SHARE: { URL: { min: 3, max: 2000 } // Length + }, + CONTACT_FORM: { + FROM_NAME: { min: 1, max: 120 }, // Length + BODY: { min: 3, max: 5000 } // Length } } @@ -402,6 +416,8 @@ const RATES_LIMIT = { } let VIDEO_VIEW_LIFETIME = 60000 * 60 // 1 hour +let CONTACT_FORM_LIFETIME = 60000 * 60 // 1 hour + const VIDEO_TRANSCODING_FPS: VideoTranscodingFPS = { MIN: 10, AVERAGE: 30, @@ -477,27 +493,31 @@ const VIDEO_ABUSE_STATES = { [VideoAbuseState.ACCEPTED]: 'Accepted' } -const VIDEO_MIMETYPE_EXT = { - 'video/webm': '.webm', - 'video/ogg': '.ogv', - 'video/mp4': '.mp4' -} -const VIDEO_EXT_MIMETYPE = invert(VIDEO_MIMETYPE_EXT) - -const IMAGE_MIMETYPE_EXT = { - 'image/png': '.png', - 'image/jpg': '.jpg', - 'image/jpeg': '.jpg' -} - -const VIDEO_CAPTIONS_MIMETYPE_EXT = { - 'text/vtt': '.vtt', - 'application/x-subrip': '.srt' -} - -const TORRENT_MIMETYPE_EXT = { - 'application/x-bittorrent': '.torrent' +const MIMETYPES = { + VIDEO: { + MIMETYPE_EXT: buildVideoMimetypeExt(), + EXT_MIMETYPE: null as { [ id: string ]: string } + }, + IMAGE: { + MIMETYPE_EXT: { + 'image/png': '.png', + 'image/jpg': '.jpg', + 'image/jpeg': '.jpg' + } + }, + VIDEO_CAPTIONS: { + MIMETYPE_EXT: { + 'text/vtt': '.vtt', + 'application/x-subrip': '.srt' + } + }, + TORRENT: { + MIMETYPE_EXT: { + 'application/x-bittorrent': '.torrent' + } + } } +MIMETYPES.VIDEO.EXT_MIMETYPE = invert(MIMETYPES.VIDEO.MIMETYPE_EXT) // --------------------------------------------------------------------------- @@ -523,7 +543,7 @@ const ACTIVITY_PUB = { COLLECTION_ITEMS_PER_PAGE: 10, FETCH_PAGE_LIMIT: 100, URL_MIME_TYPES: { - VIDEO: Object.keys(VIDEO_MIMETYPE_EXT), + VIDEO: Object.keys(MIMETYPES.VIDEO.MIMETYPE_EXT), TORRENT: [ 'application/x-bittorrent' ], MAGNET: [ 'application/x-bittorrent;x-scheme-handler/magnet' ] }, @@ -569,6 +589,7 @@ const STATIC_PATHS = { THUMBNAILS: '/static/thumbnails/', TORRENTS: '/static/torrents/', WEBSEED: '/static/webseed/', + REDUNDANCY: '/static/redundancy/', AVATARS: '/static/avatars/', VIDEO_CAPTIONS: '/static/video-captions/' } @@ -665,7 +686,7 @@ if (isTestInstance() === true) { CONSTRAINTS_FIELDS.ACTORS.AVATAR.FILE_SIZE.max = 100 * 1024 // 100KB - SCHEDULER_INTERVALS_MS.badActorFollow = 10000 + SCHEDULER_INTERVALS_MS.actorFollowScores = 1000 SCHEDULER_INTERVALS_MS.removeOldJobs = 10000 SCHEDULER_INTERVALS_MS.updateVideos = 5000 REPEAT_JOBS['videos-views'] = { every: 5000 } @@ -673,6 +694,7 @@ if (isTestInstance() === true) { REDUNDANCY.VIDEOS.RANDOMIZED_FACTOR = 1 VIDEO_VIEW_LIFETIME = 1000 // 1 second + CONTACT_FORM_LIFETIME = 1000 // 1 second JOB_ATTEMPTS['email'] = 1 @@ -681,13 +703,12 @@ if (isTestInstance() === true) { ROUTE_CACHE_LIFETIME.OVERVIEWS.VIDEOS = '0ms' } -updateWebserverConfig() +updateWebserverUrls() // --------------------------------------------------------------------------- export { API_VERSION, - VIDEO_CAPTIONS_MIMETYPE_EXT, AVATARS_SIZE, ACCEPT_HEADERS, BCRYPT_SALT_SIZE, @@ -715,7 +736,6 @@ export { FEEDS, JOB_TTL, NSFW_POLICY_TYPES, - TORRENT_MIMETYPE_EXT, STATIC_MAX_AGE, STATIC_PATHS, VIDEO_IMPORT_TIMEOUT, @@ -728,7 +748,6 @@ export { VIDEO_LICENCES, VIDEO_STATES, VIDEO_RATE_TYPES, - VIDEO_MIMETYPE_EXT, VIDEO_TRANSCODING_FPS, FFMPEG_NICE, VIDEO_ABUSE_STATES, @@ -736,18 +755,18 @@ export { USER_PASSWORD_RESET_LIFETIME, MEMOIZE_TTL, USER_EMAIL_VERIFY_LIFETIME, - IMAGE_MIMETYPE_EXT, OVERVIEWS, SCHEDULER_INTERVALS_MS, REPEAT_JOBS, STATIC_DOWNLOAD_PATHS, RATES_LIMIT, - VIDEO_EXT_MIMETYPE, + MIMETYPES, CRAWL_REQUEST_CONCURRENCY, JOB_COMPLETED_LIFETIME, HTTP_SIGNATURE, VIDEO_IMPORT_STATES, VIDEO_VIEW_LIFETIME, + CONTACT_FORM_LIFETIME, buildLanguages } @@ -764,16 +783,48 @@ function getLocalConfigFilePath () { return join(dirname(configSources[ 0 ].name), filename + '.json') } -function updateWebserverConfig () { +function buildVideoMimetypeExt () { + const data = { + 'video/webm': '.webm', + 'video/ogg': '.ogv', + 'video/mp4': '.mp4' + } + + if (CONFIG.TRANSCODING.ENABLED && CONFIG.TRANSCODING.ALLOW_ADDITIONAL_EXTENSIONS) { + Object.assign(data, { + 'video/quicktime': '.mov', + 'video/x-msvideo': '.avi', + 'video/x-flv': '.flv', + 'video/x-matroska': '.mkv' + }) + } + + return data +} + +function updateWebserverUrls () { CONFIG.WEBSERVER.URL = sanitizeUrl(CONFIG.WEBSERVER.SCHEME + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT) CONFIG.WEBSERVER.HOST = sanitizeHost(CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT, REMOTE_SCHEME.HTTP) } +function updateWebserverConfig () { + CONSTRAINTS_FIELDS.VIDEOS.EXTNAME = buildVideosExtname() + + MIMETYPES.VIDEO.MIMETYPE_EXT = buildVideoMimetypeExt() + MIMETYPES.VIDEO.EXT_MIMETYPE = invert(MIMETYPES.VIDEO.MIMETYPE_EXT) +} + +function buildVideosExtname () { + return CONFIG.TRANSCODING.ENABLED && CONFIG.TRANSCODING.ALLOW_ADDITIONAL_EXTENSIONS + ? [ '.mp4', '.ogv', '.webm', '.mkv', '.mov', '.avi', '.flv' ] + : [ '.mp4', '.ogv', '.webm' ] +} + function buildVideosRedundancy (objs: any[]): VideosRedundancy[] { if (!objs) return [] return objs.map(obj => { - return Object.assign(obj, { + return Object.assign({}, obj, { minLifetime: parseDuration(obj.min_lifetime), size: bytes.parse(obj.size), minViews: obj.min_views @@ -850,4 +901,5 @@ export function reloadConfig () { config = require('config') updateWebserverConfig() + updateWebserverUrls() }