projects
/
oweals
/
peertube.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release/1.4.0' into develop
[oweals/peertube.git]
/
server
/
initializers
/
constants.ts
diff --git
a/server/initializers/constants.ts
b/server/initializers/constants.ts
index 93ccb7da842e930388f8c7715a0b8d3d3b9750ca..be4a664889b9f7bcf2937d2c75349e08b6133fb8 100644
(file)
--- a/
server/initializers/constants.ts
+++ b/
server/initializers/constants.ts
@@
-14,12
+14,12
@@
import { CONFIG, registerConfigChangedHandler } from './config'
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-const LAST_MIGRATION_VERSION = 4
00
+const LAST_MIGRATION_VERSION = 4
35
// ---------------------------------------------------------------------------
const API_VERSION = 'v1'
// ---------------------------------------------------------------------------
const API_VERSION = 'v1'
-const PEERTUBE_VERSION =
process.env.npm_package_version || 'unknown'
+const PEERTUBE_VERSION =
require(join(root(), 'package.json')).version
const PAGINATION = {
COUNT: {
const PAGINATION = {
COUNT: {
@@
-39,7
+39,7
@@
const WEBSERVER = {
// Sortable columns per schema
const SORTABLE_COLUMNS = {
// Sortable columns per schema
const SORTABLE_COLUMNS = {
- USERS: [ 'id', 'username', 'createdAt' ],
+ USERS: [ 'id', 'username', '
videoQuotaUsed', '
createdAt' ],
USER_SUBSCRIPTIONS: [ 'id', 'createdAt' ],
ACCOUNTS: [ 'createdAt' ],
JOBS: [ 'createdAt' ],
USER_SUBSCRIPTIONS: [ 'id', 'createdAt' ],
ACCOUNTS: [ 'createdAt' ],
JOBS: [ 'createdAt' ],
@@
-168,10
+168,15
@@
const SCHEDULER_INTERVALS_MS = {
updateVideos: 60000, // 1 minute
youtubeDLUpdate: 60000 * 60 * 24, // 1 day
checkPlugins: CONFIG.PLUGINS.INDEX.CHECK_LATEST_VERSIONS_INTERVAL,
updateVideos: 60000, // 1 minute
youtubeDLUpdate: 60000 * 60 * 24, // 1 day
checkPlugins: CONFIG.PLUGINS.INDEX.CHECK_LATEST_VERSIONS_INTERVAL,
+ autoFollowIndexInstances: 60000 * 60 * 24, // 1 day
removeOldViews: 60000 * 60 * 24, // 1 day
removeOldHistory: 60000 * 60 * 24 // 1 day
}
removeOldViews: 60000 * 60 * 24, // 1 day
removeOldHistory: 60000 * 60 * 24 // 1 day
}
+const INSTANCES_INDEX = {
+ HOSTS_PATH: '/api/v1/instances/hosts'
+}
+
// ---------------------------------------------------------------------------
const CONSTRAINTS_FIELDS = {
// ---------------------------------------------------------------------------
const CONSTRAINTS_FIELDS = {
@@
-498,9
+503,17
@@
const STATIC_DOWNLOAD_PATHS = {
TORRENTS: '/download/torrents/',
VIDEOS: '/download/videos/'
}
TORRENTS: '/download/torrents/',
VIDEOS: '/download/videos/'
}
+const LAZY_STATIC_PATHS = {
+ AVATARS: '/lazy-static/avatars/',
+ PREVIEWS: '/static/previews/',
+ VIDEO_CAPTIONS: '/static/video-captions/'
+}
// Cache control
// Cache control
-let STATIC_MAX_AGE = '2h'
+let STATIC_MAX_AGE = {
+ SERVER: '2h',
+ CLIENT: '30d'
+}
// Videos thumbnail size
const THUMBNAILS_SIZE = {
// Videos thumbnail size
const THUMBNAILS_SIZE = {
@@
-533,9
+546,12
@@
const FILES_CACHE = {
}
}
}
}
-const CACHE = {
+const
LRU_
CACHE = {
USER_TOKENS: {
USER_TOKENS: {
- MAX_SIZE: 10000
+ MAX_SIZE: 1000
+ },
+ AVATAR_STATIC: {
+ MAX_SIZE: 500
}
}
}
}
@@
-546,6
+562,10
@@
const MEMOIZE_TTL = {
OVERVIEWS_SAMPLE: 1000 * 3600 * 4 // 4 hours
}
OVERVIEWS_SAMPLE: 1000 * 3600 * 4 // 4 hours
}
+const QUEUE_CONCURRENCY = {
+ AVATAR_PROCESS_IMAGE: 3
+}
+
const REDUNDANCY = {
VIDEOS: {
RANDOMIZED_FACTOR: 5
const REDUNDANCY = {
VIDEOS: {
RANDOMIZED_FACTOR: 5
@@
-604,7
+624,7
@@
if (isTestInstance() === true) {
REMOTE_SCHEME.HTTP = 'http'
REMOTE_SCHEME.WS = 'ws'
REMOTE_SCHEME.HTTP = 'http'
REMOTE_SCHEME.WS = 'ws'
- STATIC_MAX_AGE = '0'
+ STATIC_MAX_AGE
.SERVER
= '0'
ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE = 2
ACTIVITY_PUB.ACTOR_REFRESH_INTERVAL = 10 * 1000 // 10 seconds
ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE = 2
ACTIVITY_PUB.ACTOR_REFRESH_INTERVAL = 10 * 1000 // 10 seconds
@@
-618,6
+638,7
@@
if (isTestInstance() === true) {
SCHEDULER_INTERVALS_MS.removeOldHistory = 5000
SCHEDULER_INTERVALS_MS.removeOldViews = 5000
SCHEDULER_INTERVALS_MS.updateVideos = 5000
SCHEDULER_INTERVALS_MS.removeOldHistory = 5000
SCHEDULER_INTERVALS_MS.removeOldViews = 5000
SCHEDULER_INTERVALS_MS.updateVideos = 5000
+ SCHEDULER_INTERVALS_MS.autoFollowIndexInstances = 5000
REPEAT_JOBS[ 'videos-views' ] = { every: 5000 }
REDUNDANCY.VIDEOS.RANDOMIZED_FACTOR = 1
REPEAT_JOBS[ 'videos-views' ] = { every: 5000 }
REDUNDANCY.VIDEOS.RANDOMIZED_FACTOR = 1
@@
-646,6
+667,7
@@
export {
WEBSERVER,
API_VERSION,
PEERTUBE_VERSION,
WEBSERVER,
API_VERSION,
PEERTUBE_VERSION,
+ LAZY_STATIC_PATHS,
HLS_REDUNDANCY_DIRECTORY,
P2P_MEDIA_LOADER_PEER_VERSION,
AVATARS_SIZE,
HLS_REDUNDANCY_DIRECTORY,
P2P_MEDIA_LOADER_PEER_VERSION,
AVATARS_SIZE,
@@
-667,6
+689,7
@@
export {
PREVIEWS_SIZE,
REMOTE_SCHEME,
FOLLOW_STATES,
PREVIEWS_SIZE,
REMOTE_SCHEME,
FOLLOW_STATES,
+ INSTANCES_INDEX,
DEFAULT_USER_THEME_NAME,
SERVER_ACTOR_NAME,
PLUGIN_GLOBAL_CSS_FILE_NAME,
DEFAULT_USER_THEME_NAME,
SERVER_ACTOR_NAME,
PLUGIN_GLOBAL_CSS_FILE_NAME,
@@
-692,11
+715,12
@@
export {
VIDEO_PRIVACIES,
VIDEO_LICENCES,
VIDEO_STATES,
VIDEO_PRIVACIES,
VIDEO_LICENCES,
VIDEO_STATES,
+ QUEUE_CONCURRENCY,
VIDEO_RATE_TYPES,
VIDEO_TRANSCODING_FPS,
FFMPEG_NICE,
VIDEO_ABUSE_STATES,
VIDEO_RATE_TYPES,
VIDEO_TRANSCODING_FPS,
FFMPEG_NICE,
VIDEO_ABUSE_STATES,
- CACHE,
+
LRU_
CACHE,
JOB_REQUEST_TIMEOUT,
USER_PASSWORD_RESET_LIFETIME,
MEMOIZE_TTL,
JOB_REQUEST_TIMEOUT,
USER_PASSWORD_RESET_LIFETIME,
MEMOIZE_TTL,