import { join } from 'path'
+import { randomBytes } from 'crypto'
import { JobType, VideoRateType, VideoResolution, VideoState } from '../../shared/models'
import { ActivityPubActorType } from '../../shared/models/activitypub'
import { FollowState } from '../../shared/models/actors'
import { VideoAbuseState, VideoImportState, VideoPrivacy, VideoTranscodingFPS } from '../../shared/models/videos'
// Do not use barrels, remain constants as independent as possible
-import { isTestInstance, sanitizeHost, sanitizeUrl, root, parseDurationToMs } from '../helpers/core-utils'
+import { isTestInstance, sanitizeHost, sanitizeUrl, root } from '../helpers/core-utils'
import { NSFWPolicyType } from '../../shared/models/videos/nsfw-policy.type'
import { invert } from 'lodash'
import { CronRepeatOptions, EveryRepeatOptions } from 'bull'
// ---------------------------------------------------------------------------
-const LAST_MIGRATION_VERSION = 475
+const LAST_MIGRATION_VERSION = 515
// ---------------------------------------------------------------------------
FOLLOWERS: [ 'createdAt', 'state', 'score' ],
FOLLOWING: [ 'createdAt', 'redundancyAllowed', 'state' ],
- VIDEOS: [ 'name', 'duration', 'createdAt', 'publishedAt', 'views', 'likes', 'trending' ],
+ VIDEOS: [ 'name', 'duration', 'createdAt', 'publishedAt', 'originallyPublishedAt', 'views', 'likes', 'trending' ],
- VIDEOS_SEARCH: [ 'name', 'duration', 'createdAt', 'publishedAt', 'views', 'likes', 'match' ],
+ // 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' ],
ACCOUNTS_BLOCKLIST: [ 'createdAt' ],
SECURITYTXT: '2 hours',
NODEINFO: '10 minutes',
DNT_POLICY: '1 week',
- OVERVIEWS: {
- VIDEOS: '1 hour'
- },
ACTIVITY_PUB: {
VIDEOS: '1 second' // 1 second, cache concurrent requests after a broadcast for example
},
const JOB_TTL: { [id in JobType]: number } = {
'activitypub-http-broadcast': 60000 * 10, // 10 minutes
'activitypub-http-unicast': 60000 * 10, // 10 minutes
- 'activitypub-http-fetcher': 60000 * 10, // 10 minutes
+ 'activitypub-http-fetcher': 1000 * 3600 * 10, // 10 hours
'activitypub-follow': 60000 * 10, // 10 minutes
'video-file-import': 1000 * 3600, // 1 hour
'video-transcoding': 1000 * 3600 * 48, // 2 days, transcoding could be long
- 'video-import': 1000 * 3600 * 2, // hours
+ 'video-import': 1000 * 3600 * 2, // 2 hours
'email': 60000 * 10, // 10 minutes
'videos-views': undefined, // Unlimited
'activitypub-refresher': 60000 * 10, // 10 minutes
removeOldHistory: 60000 * 60 * 24 // 1 day
}
-const INSTANCES_INDEX = {
- HOSTS_PATH: '/api/v1/instances/hosts'
-}
-
// ---------------------------------------------------------------------------
const CONSTRAINTS_FIELDS = {
COUNT: { min: 0 }
},
VIDEO_COMMENTS: {
- TEXT: { min: 1, max: 3000 }, // Length
+ TEXT: { min: 1, max: 10000 }, // Length
URL: { min: 3, max: 2000 } // Length
},
VIDEO_SHARE: {
const VIDEO_TRANSCODING_FPS: VideoTranscodingFPS = {
MIN: 10,
- STANDARD: [24, 25, 30],
- HD_STANDARD: [50, 60],
+ STANDARD: [ 24, 25, 30 ],
+ HD_STANDARD: [ 50, 60 ],
AVERAGE: 30,
MAX: 60,
KEEP_ORIGIN_FPS_RESOLUTION_MIN: 720 // We keep the original FPS on high resolutions (720 minimum)
7: 'Public Domain Dedication'
}
-let VIDEO_LANGUAGES: { [id: string]: string } = {}
+const VIDEO_LANGUAGES: { [id: string]: string } = {}
const VIDEO_PRIVACIES = {
- [ VideoPrivacy.PUBLIC ]: 'Public',
- [ VideoPrivacy.UNLISTED ]: 'Unlisted',
- [ VideoPrivacy.PRIVATE ]: 'Private',
- [ VideoPrivacy.INTERNAL ]: 'Internal'
+ [VideoPrivacy.PUBLIC]: 'Public',
+ [VideoPrivacy.UNLISTED]: 'Unlisted',
+ [VideoPrivacy.PRIVATE]: 'Private',
+ [VideoPrivacy.INTERNAL]: 'Internal'
}
const VIDEO_STATES = {
- [ VideoState.PUBLISHED ]: 'Published',
- [ VideoState.TO_TRANSCODE ]: 'To transcode',
- [ VideoState.TO_IMPORT ]: 'To import'
+ [VideoState.PUBLISHED]: 'Published',
+ [VideoState.TO_TRANSCODE]: 'To transcode',
+ [VideoState.TO_IMPORT]: 'To import'
}
const VIDEO_IMPORT_STATES = {
- [ VideoImportState.FAILED ]: 'Failed',
- [ VideoImportState.PENDING ]: 'Pending',
- [ VideoImportState.SUCCESS ]: 'Success'
+ [VideoImportState.FAILED]: 'Failed',
+ [VideoImportState.PENDING]: 'Pending',
+ [VideoImportState.SUCCESS]: 'Success',
+ [VideoImportState.REJECTED]: 'Rejected'
}
const VIDEO_ABUSE_STATES = {
- [ VideoAbuseState.PENDING ]: 'Pending',
- [ VideoAbuseState.REJECTED ]: 'Rejected',
- [ VideoAbuseState.ACCEPTED ]: 'Accepted'
+ [VideoAbuseState.PENDING]: 'Pending',
+ [VideoAbuseState.REJECTED]: 'Rejected',
+ [VideoAbuseState.ACCEPTED]: 'Accepted'
}
const VIDEO_PLAYLIST_PRIVACIES = {
- [ VideoPlaylistPrivacy.PUBLIC ]: 'Public',
- [ VideoPlaylistPrivacy.UNLISTED ]: 'Unlisted',
- [ VideoPlaylistPrivacy.PRIVATE ]: 'Private'
+ [VideoPlaylistPrivacy.PUBLIC]: 'Public',
+ [VideoPlaylistPrivacy.UNLISTED]: 'Unlisted',
+ [VideoPlaylistPrivacy.PRIVATE]: 'Private'
}
const VIDEO_PLAYLIST_TYPES = {
- [ VideoPlaylistType.REGULAR ]: 'Regular',
- [ VideoPlaylistType.WATCH_LATER ]: 'Watch later'
+ [VideoPlaylistType.REGULAR]: 'Regular',
+ [VideoPlaylistType.WATCH_LATER]: 'Watch later'
}
const MIMETYPES = {
'audio/mp3': '.mp3',
'application/ogg': '.ogg',
'audio/ogg': '.ogg',
+ 'audio/x-ms-wma': '.wma',
+ 'audio/wav': '.wav',
+ 'audio/x-flac': '.flac',
'audio/flac': '.flac'
},
EXT_MIMETYPE: null as { [ id: string ]: string }
'image/png': '.png',
'image/jpg': '.jpg',
'image/jpeg': '.jpg'
- }
+ },
+ EXT_MIMETYPE: null as { [ id: string ]: string }
},
VIDEO_CAPTIONS: {
MIMETYPE_EXT: {
}
}
MIMETYPES.AUDIO.EXT_MIMETYPE = invert(MIMETYPES.AUDIO.MIMETYPE_EXT)
+MIMETYPES.IMAGE.EXT_MIMETYPE = invert(MIMETYPES.IMAGE.MIMETYPE_EXT)
// ---------------------------------------------------------------------------
const OVERVIEWS = {
VIDEOS: {
SAMPLE_THRESHOLD: 6,
- SAMPLES_COUNT: 2
+ SAMPLES_COUNT: 20
}
}
ACCEPT_HEADER: 'application/activity+json, application/ld+json',
PUBLIC: 'https://www.w3.org/ns/activitystreams#Public',
COLLECTION_ITEMS_PER_PAGE: 10,
- FETCH_PAGE_LIMIT: 100,
+ FETCH_PAGE_LIMIT: 2000,
URL_MIME_TYPES: {
VIDEO: [] as string[],
TORRENT: [ 'application/x-bittorrent' ],
const BCRYPT_SALT_SIZE = 10
const USER_PASSWORD_RESET_LIFETIME = 60000 * 60 // 60 minutes
+const USER_PASSWORD_CREATE_LIFETIME = 60000 * 60 * 24 * 7 // 7 days
const USER_EMAIL_VERIFY_LIFETIME = 60000 * 60 // 60 minutes
}
// Cache control
-let STATIC_MAX_AGE = {
+const STATIC_MAX_AGE = {
SERVER: '2h',
CLIENT: '30d'
}
// Videos thumbnail size
const THUMBNAILS_SIZE = {
width: 223,
- height: 122
+ height: 122,
+ minWidth: 150
}
const PREVIEWS_SIZE = {
width: 850,
- height: 480
+ height: 480,
+ minWidth: 400
}
const AVATARS_SIZE = {
width: 120,
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
+ ANNOUNCES_PER_IP: 30, // maximum announces for all our torrents in the interval
+ BLOCK_IP_LIFETIME: 60000 * 10 // 10 minutes
}
const P2P_MEDIA_LOADER_PEER_VERSION = 2
const PLUGIN_GLOBAL_CSS_FILE_NAME = 'plugins-global.css'
const PLUGIN_GLOBAL_CSS_PATH = join(CONFIG.STORAGE.TMP_DIR, PLUGIN_GLOBAL_CSS_FILE_NAME)
+let PLUGIN_EXTERNAL_AUTH_TOKEN_LIFETIME = 1000 * 60 * 5 // 5 minutes
+
const DEFAULT_THEME_NAME = 'default'
const DEFAULT_USER_THEME_NAME = 'instance-default'
// ---------------------------------------------------------------------------
+const SEARCH_INDEX = {
+ ROUTES: {
+ VIDEOS: '/api/v1/search/videos',
+ VIDEO_CHANNELS: '/api/v1/search/video-channels'
+ }
+}
+
+// ---------------------------------------------------------------------------
+
// Special constants for a test instance
if (isTestInstance() === true) {
PRIVATE_RSA_KEY_SIZE = 1024
SCHEDULER_INTERVALS_MS.removeOldViews = 5000
SCHEDULER_INTERVALS_MS.updateVideos = 5000
SCHEDULER_INTERVALS_MS.autoFollowIndexInstances = 5000
- REPEAT_JOBS[ 'videos-views' ] = { every: 5000 }
+ REPEAT_JOBS['videos-views'] = { every: 5000 }
REDUNDANCY.VIDEOS.RANDOMIZED_FACTOR = 1
VIDEO_VIEW_LIFETIME = 1000 // 1 second
CONTACT_FORM_LIFETIME = 1000 // 1 second
- JOB_ATTEMPTS[ 'email' ] = 1
+ JOB_ATTEMPTS['email'] = 1
FILES_CACHE.VIDEO_CAPTIONS.MAX_AGE = 3000
- MEMOIZE_TTL.OVERVIEWS_SAMPLE = 1
- ROUTE_CACHE_LIFETIME.OVERVIEWS.VIDEOS = '0ms'
+ MEMOIZE_TTL.OVERVIEWS_SAMPLE = 3000
+ OVERVIEWS.VIDEOS.SAMPLE_THRESHOLD = 2
+
+ PLUGIN_EXTERNAL_AUTH_TOKEN_LIFETIME = 5000
}
updateWebserverUrls()
// ---------------------------------------------------------------------------
+const FILES_CONTENT_HASH = {
+ MANIFEST: generateContentHash(),
+ FAVICON: generateContentHash(),
+ LOGO: generateContentHash()
+}
+
+// ---------------------------------------------------------------------------
+
export {
WEBSERVER,
API_VERSION,
PEERTUBE_VERSION,
LAZY_STATIC_PATHS,
+ SEARCH_INDEX,
HLS_REDUNDANCY_DIRECTORY,
P2P_MEDIA_LOADER_PEER_VERSION,
AVATARS_SIZE,
PREVIEWS_SIZE,
REMOTE_SCHEME,
FOLLOW_STATES,
- INSTANCES_INDEX,
DEFAULT_USER_THEME_NAME,
SERVER_ACTOR_NAME,
PLUGIN_GLOBAL_CSS_FILE_NAME,
LRU_CACHE,
JOB_REQUEST_TIMEOUT,
USER_PASSWORD_RESET_LIFETIME,
+ USER_PASSWORD_CREATE_LIFETIME,
MEMOIZE_TTL,
USER_EMAIL_VERIFY_LIFETIME,
OVERVIEWS,
VIDEO_VIEW_LIFETIME,
CONTACT_FORM_LIFETIME,
VIDEO_PLAYLIST_PRIVACIES,
+ PLUGIN_EXTERNAL_AUTH_TOKEN_LIFETIME,
ASSETS_PATH,
+ FILES_CONTENT_HASH,
loadLanguages,
- buildLanguages
+ buildLanguages,
+ generateContentHash
}
// ---------------------------------------------------------------------------
'video/x-msvideo': '.avi',
'video/x-flv': '.flv',
'video/x-matroska': '.mkv',
- 'application/octet-stream': '.mkv',
'video/avi': '.avi',
'video/x-m4v': '.m4v',
+ // Could be anything
+ 'application/octet-stream': null,
'video/m4v': '.m4v'
})
}
function buildLanguages () {
const iso639 = require('iso-639-3')
- const languages: { [ id: string ]: string } = {}
+ const languages: { [id: string]: string } = {}
const additionalLanguages = {
- 'sgn': true, // Sign languages (macro language)
- 'ase': true, // American sign language
- 'sdl': true, // Arabian sign language
- 'bfi': true, // British sign language
- 'bzs': true, // Brazilian sign language
- 'csl': true, // Chinese sign language
- 'cse': true, // Czech sign language
- 'dsl': true, // Danish sign language
- 'fsl': true, // French sign language
- 'gsg': true, // German sign language
- 'pks': true, // Pakistan sign language
- 'jsl': true, // Japanese sign language
- 'sfs': true, // South African sign language
- 'swl': true, // Swedish sign language
- 'rsl': true, // Russian sign language: true
-
- 'epo': true, // Esperanto
- 'tlh': true, // Klingon
- 'jbo': true, // Lojban
- 'avk': true // Kotava
+ sgn: true, // Sign languages (macro language)
+ ase: true, // American sign language
+ sdl: true, // Arabian sign language
+ bfi: true, // British sign language
+ bzs: true, // Brazilian sign language
+ csl: true, // Chinese sign language
+ cse: true, // Czech sign language
+ dsl: true, // Danish sign language
+ fsl: true, // French sign language
+ gsg: true, // German sign language
+ pks: true, // Pakistan sign language
+ jsl: true, // Japanese sign language
+ sfs: true, // South African sign language
+ swl: true, // Swedish sign language
+ rsl: true, // Russian sign language: true
+
+ epo: true, // Esperanto
+ tlh: true, // Klingon
+ jbo: true, // Lojban
+ avk: true // Kotava
}
// Only add ISO639-1 languages and some sign languages (ISO639-3)
iso639
.filter(l => {
- return (l.iso6391 !== null && l.type === 'living') ||
- additionalLanguages[ l.iso6393 ] === true
+ return (l.iso6391 !== undefined && l.type === 'living') ||
+ additionalLanguages[l.iso6393] === true
})
- .forEach(l => languages[ l.iso6391 || l.iso6393 ] = l.name)
+ .forEach(l => { languages[l.iso6391 || l.iso6393] = l.name })
// Override Occitan label
- languages[ 'oc' ] = 'Occitan'
- languages[ 'el' ] = 'Greek'
+ languages['oc'] = 'Occitan'
+ languages['el'] = 'Greek'
return languages
}
+
+function generateContentHash () {
+ return randomBytes(20).toString('hex')
+}
projects / github / Chocobozzz / PeerTube.git / blobdiff