31 files changed, 131 insertions, 144 deletions

diff --git a/scripts/benchmark.ts b/scripts/benchmark.ts
index 788318313..3c3c666a1 100644
--- a/scripts/benchmark.ts
+++ b/scripts/benchmark.ts
@@ -1,10 +1,7 @@
-import { registerTSPaths } from '../server/helpers/register-ts-paths'
-registerTSPaths()
-
 import autocannon, { printResult } from 'autocannon'
 import { writeJson } from 'fs-extra'
-import { createSingleServer, killallServers, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils'
 import { Video, VideoPrivacy } from '@shared/models'
+import { createSingleServer, killallServers, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands'
 
 let server: PeerTubeServer
 let video: Video
diff --git a/scripts/build/client.sh b/scripts/build/client.sh
index e891b217c..bae91a2b6 100755
--- a/scripts/build/client.sh
+++ b/scripts/build/client.sh
@@ -35,6 +35,8 @@ languages=(
     ["de"]="de-DE"
     ["it"]="it-IT"
     ["sq"]="sq"
+    ["nn"]="nn"
+    ["nb"]="nb-NO"
     ["kab"]="kab"
 )
 
diff --git a/scripts/build/server.sh b/scripts/build/server.sh
index b903f8250..a2dfc3dd9 100755
--- a/scripts/build/server.sh
+++ b/scripts/build/server.sh
@@ -4,7 +4,8 @@ set -eu
 
 rm -rf ./dist
 
-npm run tsc
-cp "./tsconfig.json" "./dist"
+npm run tsc -- -b --verbose
+npm run resolve-tspaths:server
+
 cp -r "./server/static" "./server/assets" "./dist/server"
 cp -r "./server/lib/emails" "./dist/server/lib"
diff --git a/scripts/ci.sh b/scripts/ci.sh
index a628cbced..2bacf2a2e 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -23,7 +23,7 @@ runTest () {
     joblog="$jobname-ci.log"
 
     parallel -j $jobs --retries $retries \
-        "echo Trying {} >> $joblog; npm run mocha -- -c --timeout 30000 --exit --require ./dist/server/tests/register.js --bail {}" \
+        "echo Trying {} >> $joblog; npm run mocha -- -c --timeout 30000 --exit --bail {}" \
         ::: $files
 
     cat "$joblog" | uniq -c
@@ -40,7 +40,10 @@ findTestFiles () {
     find $1 -type f -name "*.js" $exception | xargs echo
 }
 
-if [ "$1" = "client" ]; then
+if [ "$1" = "types-package" ]; then
+    npm run generate-types-package 0.0.0
+    npm run tsc -- --noEmit --esModuleInterop packages/types/tests/test.ts
+elif [ "$1" = "client" ]; then
     npm run build
 
     feedsFiles=$(findTestFiles ./dist/server/tests/feeds)
diff --git a/scripts/clean/server/test.sh b/scripts/clean/server/test.sh
index f85daf810..5c30c7639 100755
--- a/scripts/clean/server/test.sh
+++ b/scripts/clean/server/test.sh
@@ -20,9 +20,9 @@ dropRedis () {
   port=$((9000+$1))
   host="localhost"
 
-  redis-cli -h "$host" KEYS "bull-localhost:$port*" | grep -v empty | xargs --no-run-if-empty redis-cli -h "$host" DEL
-  redis-cli -h "$host" KEYS "redis-localhost:$port*" | grep -v empty | xargs --no-run-if-empty redis-cli -h "$host" DEL
-  redis-cli -h "$host" KEYS "*redis-localhost:$port-" | grep -v empty | xargs --no-run-if-empty redis-cli -h "$host" DEL
+  redis-cli -h "$host" KEYS "bull-localhost:$port*" | grep -v empty | xargs -r redis-cli -h "$host" DEL
+  redis-cli -h "$host" KEYS "redis-localhost:$port*" | grep -v empty | xargs -r redis-cli -h "$host" DEL
+  redis-cli -h "$host" KEYS "*redis-localhost:$port-" | grep -v empty | xargs -r redis-cli -h "$host" DEL
 }
 
 seq=$(seq 1 6)
diff --git a/scripts/client-build-stats.ts b/scripts/client-build-stats.ts
index 70ceda975..d5ecd5fea 100644
--- a/scripts/client-build-stats.ts
+++ b/scripts/client-build-stats.ts
@@ -1,9 +1,6 @@
-import { registerTSPaths } from '../server/helpers/register-ts-paths'
-registerTSPaths()
-
 import { readdir, stat } from 'fs-extra'
 import { join } from 'path'
-import { root } from '@server/helpers/core-utils'
+import { root } from '@shared/core-utils'
 
 async function run () {
   const result = {
diff --git a/scripts/create-import-video-file-job.ts b/scripts/create-import-video-file-job.ts
index 071d36df4..97e9c7933 100644
--- a/scripts/create-import-video-file-job.ts
+++ b/scripts/create-import-video-file-job.ts
@@ -1,12 +1,9 @@
-import { registerTSPaths } from '../server/helpers/register-ts-paths'
-registerTSPaths()
-
 import { program } from 'commander'
 import { resolve } from 'path'
-import { VideoModel } from '../server/models/video/video'
+import { isUUIDValid, toCompleteUUID } from '@server/helpers/custom-validators/misc'
 import { initDatabaseModels } from '../server/initializers/database'
 import { JobQueue } from '../server/lib/job-queue'
-import { isUUIDValid, toCompleteUUID } from '@server/helpers/custom-validators/misc'
+import { VideoModel } from '../server/models/video/video'
 
 program
   .option('-v, --video [videoUUID]', 'Video UUID')
diff --git a/scripts/create-move-video-storage-job.ts b/scripts/create-move-video-storage-job.ts
index 505bbd61b..7465c1ce0 100644
--- a/scripts/create-move-video-storage-job.ts
+++ b/scripts/create-move-video-storage-job.ts
@@ -1,13 +1,10 @@
-import { registerTSPaths } from '../server/helpers/register-ts-paths'
-registerTSPaths()
-
 import { program } from 'commander'
-import { VideoModel } from '@server/models/video/video'
+import { CONFIG } from '@server/initializers/config'
 import { initDatabaseModels } from '@server/initializers/database'
-import { VideoStorage } from '@shared/models'
-import { moveToExternalStorageState } from '@server/lib/video-state'
 import { JobQueue } from '@server/lib/job-queue'
-import { CONFIG } from '@server/initializers/config'
+import { moveToExternalStorageState } from '@server/lib/video-state'
+import { VideoModel } from '@server/models/video/video'
+import { VideoState, VideoStorage } from '@shared/models'
 
 program
   .description('Move videos to another storage.')
@@ -57,6 +54,16 @@ async function run () {
       process.exit(-1)
     }
 
+    if (video.isLive) {
+      console.error('Cannot process live video')
+      process.exit(-1)
+    }
+
+    if (video.state === VideoState.TO_MOVE_TO_EXTERNAL_STORAGE) {
+      console.error('This video is already being moved to external storage')
+      process.exit(-1)
+    }
+
     ids.push(video.id)
   } else {
     ids = await VideoModel.listLocalIds()
diff --git a/scripts/create-transcoding-job.ts b/scripts/create-transcoding-job.ts
index 244c38fcd..95e1e66cf 100755
--- a/scripts/create-transcoding-job.ts
+++ b/scripts/create-transcoding-job.ts
@@ -1,15 +1,12 @@
-import { registerTSPaths } from '../server/helpers/register-ts-paths'
-registerTSPaths()
-
 import { program } from 'commander'
-import { VideoModel } from '../server/models/video/video'
-import { initDatabaseModels } from '../server/initializers/database'
-import { JobQueue } from '../server/lib/job-queue'
+import { isUUIDValid, toCompleteUUID } from '@server/helpers/custom-validators/misc'
 import { computeLowerResolutionsToTranscode } from '@server/helpers/ffprobe-utils'
-import { VideoState, VideoTranscodingPayload } from '@shared/models'
 import { CONFIG } from '@server/initializers/config'
-import { isUUIDValid, toCompleteUUID } from '@server/helpers/custom-validators/misc'
 import { addTranscodingJob } from '@server/lib/video'
+import { VideoState, VideoTranscodingPayload } from '@shared/models'
+import { initDatabaseModels } from '../server/initializers/database'
+import { JobQueue } from '../server/lib/job-queue'
+import { VideoModel } from '../server/models/video/video'
 
 program
   .option('-v, --video [videoUUID]', 'Video UUID')
@@ -63,7 +60,11 @@ async function run () {
         type: 'new-resolution-to-hls',
         videoUUID: video.uuid,
         resolution,
+
+        // FIXME: check the file has audio and is not in portrait mode
         isPortraitMode: false,
+        hasAudio: true,
+
         copyCodecs: false,
         isNewVideo: false,
         isMaxQuality: maxResolution === resolution,
@@ -75,6 +76,10 @@ async function run () {
       dataInput.push({
         type: 'new-resolution-to-webtorrent',
         videoUUID: video.uuid,
+
+        // FIXME: check the file has audio
+        hasAudio: true,
+
         isNewVideo: false,
         resolution: parseInt(options.resolution)
       })
diff --git a/scripts/dev/cli.sh b/scripts/dev/cli.sh
index 4bf4808b8..327792a19 100755
--- a/scripts/dev/cli.sh
+++ b/scripts/dev/cli.sh
@@ -12,4 +12,5 @@ rm -rf ./dist/server/tools/
 mkdir -p "./dist/server/tools"
 cp -r "./server/tools/node_modules" "./dist/server/tools"
 
-npm run tsc -- --watch --sourceMap --project ./server/tools/tsconfig.json
+cd ./server/tools
+../../node_modules/.bin/tsc-watch --build --verbose --onSuccess 'sh -c "cd ../../ && npm run resolve-tspaths:all"'
diff --git a/scripts/dev/server.sh b/scripts/dev/server.sh
index 5aac470eb..9dae43a63 100755
--- a/scripts/dev/server.sh
+++ b/scripts/dev/server.sh
@@ -5,7 +5,7 @@ set -eu
 if [ ! -f "./client/dist/en-US/index.html" ]; then
   if [ -z ${1+x} ] || [ "$1" != "--skip-client" ]; then
     echo "client/dist/en-US/index.html does not exist, compile client files..."
-    npm run build:client -- --light
+    npm run build:client
   fi
 fi
 
@@ -14,15 +14,12 @@ mkdir -p "./client/dist"
 rm -rf "./client/dist/locale"
 cp -r "./client/src/locale" "./client/dist/locale"
 
-rm -rf "./dist"
+mkdir -p "./dist/server/lib"
 
-mkdir "./dist"
-cp "./tsconfig.json" "./dist"
+npm run tsc -- -b -v --incremental
+npm run resolve-tspaths:server
 
-npm run tsc -- --incremental --sourceMap
 cp -r ./server/static ./server/assets ./dist/server
 cp -r "./server/lib/emails" "./dist/server/lib"
 
-NODE_ENV=test node node_modules/.bin/concurrently -k \
-  "node_modules/.bin/nodemon --delay 1 --watch ./dist dist/server" \
-  "node_modules/.bin/tsc --incremental --sourceMap --preserveWatchOutput -w"
+./node_modules/.bin/tsc-watch --build --preserveWatchOutput --verbose --onSuccess 'sh -c "npm run resolve-tspaths:server && NODE_ENV=test node dist/server"'
diff --git a/scripts/e2e/browserstack.sh b/scripts/e2e/browserstack.sh
index fb125ea23..ad6268d42 100755
--- a/scripts/e2e/browserstack.sh
+++ b/scripts/e2e/browserstack.sh
@@ -2,8 +2,4 @@
 
 set -eu
 
-npm run clean:server:test
-
-npm run concurrently -- -k -s first \
-    "cd client/e2e && ../node_modules/.bin/wdio run ./wdio.browserstack.conf.ts" \
-    "NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"rates_limit\": { \"api\": { \"max\": 5000 }, \"login\": { \"max\": 5000 } }, \"log\": { \"level\": \"warn\" }, \"signup\": { \"enabled\": false } }' node dist/server"
+cd client/e2e && ../node_modules/.bin/wdio run ./wdio.browserstack.conf.ts
diff --git a/scripts/e2e/local.sh b/scripts/e2e/local.sh
index fe8b7f559..0e0368c52 100755
--- a/scripts/e2e/local.sh
+++ b/scripts/e2e/local.sh
@@ -2,16 +2,6 @@
 
 set -eu
 
-npm run clean:server:test
+cd client/e2e
 
-config="{"
-config+="  \"rates_limit\": { \"api\": { \"max\": 5000 }, \"login\": { \"max\": 5000 } }"
-config+=", \"log\": { \"level\": \"warn\" }"
-config+=", \"signup\": { \"enabled\": false }"
-config+=", \"transcoding\": { \"enabled\": false }"
-config+="}"
-
-npm run concurrently -- -k -s first \
-    "cd client/e2e && ../node_modules/.bin/wdio run ./wdio.local.conf.ts" \
-    "NODE_ENV=test NODE_CONFIG='$config' NODE_APP_INSTANCE=1  node dist/server" \
-    "NODE_ENV=test NODE_CONFIG='$config' NODE_APP_INSTANCE=2  node dist/server"
+../node_modules/.bin/wdio run ./wdio.local.conf.ts
diff --git a/scripts/generate-code-contributors.ts b/scripts/generate-code-contributors.ts
index 70b33c0d3..5357daf04 100755
--- a/scripts/generate-code-contributors.ts
+++ b/scripts/generate-code-contributors.ts
@@ -1,7 +1,4 @@
-import { registerTSPaths } from '../server/helpers/register-ts-paths'
-registerTSPaths()
-
-import { CLICommand } from '@shared/extra-utils'
+import { CLICommand } from '@shared/server-commands'
 
 run()
   .then(() => process.exit(0))
diff --git a/scripts/i18n/create-custom-files.ts b/scripts/i18n/create-custom-files.ts
index b363a1bdc..7556866e6 100755
--- a/scripts/i18n/create-custom-files.ts
+++ b/scripts/i18n/create-custom-files.ts
@@ -1,7 +1,7 @@
 import { writeJSON } from 'fs-extra'
 import { values } from 'lodash'
 import { join } from 'path'
-import { registerTSPaths } from '../../server/helpers/register-ts-paths'
+import { root } from '@shared/core-utils'
 import {
   buildLanguages,
   VIDEO_CATEGORIES,
@@ -14,9 +14,7 @@ import {
 } from '../../server/initializers/constants'
 import { I18N_LOCALES } from '../../shared/core-utils/i18n'
 
-registerTSPaths()
-
-const videojs = require(join(__dirname, '../../../client/src/locale/videojs.en-US.json'))
+const videojs = require(join(root(), 'client', 'src', 'locale', 'videojs.en-US.json'))
 const playerKeys = {
   'Quality': 'Quality',
   'Auto': 'Auto',
@@ -51,6 +49,9 @@ const playerKeys = {
   'Buffer Progress': 'Buffer Progress',
   'Buffer State': 'Buffer State',
   'Live Latency': 'Live Latency',
+  'P2P': 'P2P',
+  'enabled': 'enabled',
+  'disabled': 'disabled',
   '  off': '  off',
   'Player mode': 'Player mode'
 }
@@ -97,7 +98,7 @@ writeAll().catch(err => {
 })
 
 async function writeAll () {
-  const localePath = join(__dirname, '../../../client/src/locale')
+  const localePath = join(root(), 'client', 'src', 'locale')
 
   await writeJSON(join(localePath, 'player.en-US.json'), playerKeys, { spaces: 4 })
   await writeJSON(join(localePath, 'server.en-US.json'), serverKeys, { spaces: 4 })
diff --git a/scripts/i18n/update.sh b/scripts/i18n/update.sh
index 0524c9e5d..4cf0d65b7 100755
--- a/scripts/i18n/update.sh
+++ b/scripts/i18n/update.sh
@@ -8,7 +8,7 @@ cd client
 npm run ng -- extract-i18n --out-file src/locale/angular.xlf
 
 # Merge new translations in other language files
-node ./node_modules/.bin/xliffmerge -p ./.xliffmerge.json "ar" "ca-ES" "gl-ES" "cs-CZ" "da-DK" "de-DE" "el-GR" "en-GB" "en-US" "eo" "es-ES" "eu-ES" "fa-IR" "fi-FI" "fr-FR" "gd" "gl-ES" "hu-HU" "it-IT" "ja-JP" "jbo" "kab" "ko-KR" "lt-LT" "nb-NO" "nl-NL" "oc" "pl-PL" "pt-BR" "pt-PT" "ru-RU" "sk-SK" "sl-SI" "sv-SE" "ta" "th-TH" "tr-TR" "uk-UA" "vi-VN" "zh-Hans-CN" "zh-Hant-TW"
+node ./node_modules/.bin/xliffmerge -p ./.xliffmerge.json "ar" "ca-ES" "gl-ES" "cs-CZ" "da-DK" "de-DE" "el-GR" "en-GB" "en-US" "eo" "es-ES" "eu-ES" "fa-IR" "fi-FI" "fr-FR" "gd" "gl-ES" "hu-HU" "it-IT" "ja-JP" "jbo" "kab" "ko-KR" "lt-LT" "nb-NO" "nl-NL" "oc" "pl-PL" "pt-BR" "pt-PT" "ru-RU" "sk-SK" "sl-SI" "sv-SE" "ta" "th-TH" "tr-TR" "uk-UA" "vi-VN" "zh-Hans-CN" "zh-Hant-TW" "nn" "nb-NO"
 
 # Add our strings too
 cd ../
diff --git a/scripts/migrations/peertube-2.1.ts b/scripts/migrations/peertube-2.1.ts
index 4bbc203c1..2e316d996 100644
--- a/scripts/migrations/peertube-2.1.ts
+++ b/scripts/migrations/peertube-2.1.ts
@@ -1,15 +1,12 @@
-import { registerTSPaths } from '../../server/helpers/register-ts-paths'
-registerTSPaths()
-
-import { initDatabaseModels, sequelizeTypescript } from '../../server/initializers/database'
-import * as Sequelize from 'sequelize'
-import { join } from 'path'
-import { HLS_STREAMING_PLAYLIST_DIRECTORY, STATIC_PATHS, WEBSERVER } from '@server/initializers/constants'
 import { pathExists, stat, writeFile } from 'fs-extra'
-import { createTorrentPromise } from '@server/helpers/webtorrent'
-import { CONFIG } from '@server/initializers/config'
 import parseTorrent from 'parse-torrent'
+import { join } from 'path'
+import * as Sequelize from 'sequelize'
 import { logger } from '@server/helpers/logger'
+import { createTorrentPromise } from '@server/helpers/webtorrent'
+import { CONFIG } from '@server/initializers/config'
+import { HLS_STREAMING_PLAYLIST_DIRECTORY, STATIC_PATHS, WEBSERVER } from '@server/initializers/constants'
+import { initDatabaseModels, sequelizeTypescript } from '../../server/initializers/database'
 
 run()
   .then(() => process.exit(0))
diff --git a/scripts/migrations/peertube-4.0.ts b/scripts/migrations/peertube-4.0.ts
index abf431888..64cf45474 100644
--- a/scripts/migrations/peertube-4.0.ts
+++ b/scripts/migrations/peertube-4.0.ts
@@ -1,16 +1,13 @@
-import { registerTSPaths } from '../../server/helpers/register-ts-paths'
-registerTSPaths()
-
+import Bluebird from 'bluebird'
+import { move, readFile, writeFile } from 'fs-extra'
 import { join } from 'path'
+import { federateVideoIfNeeded } from '@server/lib/activitypub/videos'
 import { JobQueue } from '@server/lib/job-queue'
-import { initDatabaseModels } from '../../server/initializers/database'
 import { generateHLSMasterPlaylistFilename, generateHlsSha256SegmentsFilename, getHlsResolutionPlaylistFilename } from '@server/lib/paths'
 import { VideoPathManager } from '@server/lib/video-path-manager'
 import { VideoModel } from '@server/models/video/video'
 import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist'
-import { move, readFile, writeFile } from 'fs-extra'
-import Bluebird from 'bluebird'
-import { federateVideoIfNeeded } from '@server/lib/activitypub/videos'
+import { initDatabaseModels } from '../../server/initializers/database'
 
 run()
   .then(() => process.exit(0))
diff --git a/scripts/nightly.sh b/scripts/nightly.sh
index 5ad603929..572277f9d 100755
--- a/scripts/nightly.sh
+++ b/scripts/nightly.sh
@@ -32,7 +32,7 @@ sed -i 's/"version": "\([^"]\+\)"/"version": "\1-'"$nightly_version"'"/' ./packa
                           "$directory_name/client/package.json" "$directory_name/config" \
                           "$directory_name/dist" "$directory_name/package.json" \
                           "$directory_name/scripts" "$directory_name/support" \
-                          "$directory_name/tsconfig.json" "$directory_name/yarn.lock")
+                          "$directory_name/yarn.lock")
 
   # temporary setup
   cd ..
diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index 6cd3a1860..d3c93cee5 100755
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -1,15 +1,12 @@
-import { registerTSPaths } from '../server/helpers/register-ts-paths'
-registerTSPaths()
-
 import { program } from 'commander'
 import { createReadStream, readdir } from 'fs-extra'
 import { join } from 'path'
 import { createInterface } from 'readline'
+import { format as sqlFormat } from 'sql-formatter'
+import { inspect } from 'util'
 import * as winston from 'winston'
 import { labelFormatter, mtimeSortFilesDesc } from '../server/helpers/logger'
 import { CONFIG } from '../server/initializers/config'
-import { inspect } from 'util'
-import { format as sqlFormat } from 'sql-formatter'
 
 program
   .option('-l, --level [level]', 'Level log (debug/info/warn/error)')
diff --git a/scripts/plugin/install.ts b/scripts/plugin/install.ts
index de045c2d2..0795d7c93 100755
--- a/scripts/plugin/install.ts
+++ b/scripts/plugin/install.ts
@@ -1,10 +1,7 @@
-import { registerTSPaths } from '../../server/helpers/register-ts-paths'
-registerTSPaths()
-
-import { initDatabaseModels } from '../../server/initializers/database'
 import { program } from 'commander'
-import { PluginManager } from '../../server/lib/plugins/plugin-manager'
 import { isAbsolute } from 'path'
+import { initDatabaseModels } from '../../server/initializers/database'
+import { PluginManager } from '../../server/lib/plugins/plugin-manager'
 
 program
   .option('-n, --npm-name [npmName]', 'Plugin to install')
diff --git a/scripts/plugin/uninstall.ts b/scripts/plugin/uninstall.ts
index 1e14cc18f..152b651dd 100755
--- a/scripts/plugin/uninstall.ts
+++ b/scripts/plugin/uninstall.ts
@@ -1,8 +1,5 @@
-import { registerTSPaths } from '../../server/helpers/register-ts-paths'
-registerTSPaths()
-
-import { initDatabaseModels } from '../../server/initializers/database'
 import { program } from 'commander'
+import { initDatabaseModels } from '../../server/initializers/database'
 import { PluginManager } from '../../server/lib/plugins/plugin-manager'
 
 program
diff --git a/scripts/print-transcode-command.ts b/scripts/print-transcode-command.ts
index 352145252..21667f544 100644
--- a/scripts/print-transcode-command.ts
+++ b/scripts/print-transcode-command.ts
@@ -1,10 +1,7 @@
-import { registerTSPaths } from '../server/helpers/register-ts-paths'
-registerTSPaths()
-
 import { program } from 'commander'
 import ffmpeg from 'fluent-ffmpeg'
-import { buildx264VODCommand, runCommand, TranscodeOptions } from '@server/helpers/ffmpeg-utils'
 import { exit } from 'process'
+import { buildx264VODCommand, runCommand, TranscodeOptions } from '@server/helpers/ffmpeg-utils'
 import { VideoTranscodingProfilesManager } from '@server/lib/transcoding/video-transcoding-profiles'
 
 program
diff --git a/scripts/prune-storage.ts b/scripts/prune-storage.ts
index 9df80d503..bb1e8e024 100755
--- a/scripts/prune-storage.ts
+++ b/scripts/prune-storage.ts
@@ -1,21 +1,19 @@
-import { registerTSPaths } from '../server/helpers/register-ts-paths'
-registerTSPaths()
-
-import { start, get } from 'prompt'
-import { join, basename } from 'path'
+import { map } from 'bluebird'
+import { readdir, remove, stat } from 'fs-extra'
+import { uniq, values } from 'lodash'
+import { basename, join } from 'path'
+import { get, start } from 'prompt'
+import { HLS_REDUNDANCY_DIRECTORY, HLS_STREAMING_PLAYLIST_DIRECTORY } from '@server/initializers/constants'
+import { VideoFileModel } from '@server/models/video/video-file'
+import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist'
+import { ThumbnailType } from '@shared/models'
+import { getUUIDFromFilename } from '../server/helpers/utils'
 import { CONFIG } from '../server/initializers/config'
-import { VideoModel } from '../server/models/video/video'
 import { initDatabaseModels } from '../server/initializers/database'
-import { readdir, remove, stat } from 'fs-extra'
+import { ActorImageModel } from '../server/models/actor/actor-image'
 import { VideoRedundancyModel } from '../server/models/redundancy/video-redundancy'
-import { map } from 'bluebird'
-import { getUUIDFromFilename } from '../server/helpers/utils'
 import { ThumbnailModel } from '../server/models/video/thumbnail'
-import { ActorImageModel } from '../server/models/actor/actor-image'
-import { uniq, values } from 'lodash'
-import { ThumbnailType } from '@shared/models'
-import { VideoFileModel } from '@server/models/video/video-file'
-import { HLS_REDUNDANCY_DIRECTORY } from '@server/initializers/constants'
+import { VideoModel } from '../server/models/video/video'
 
 run()
   .then(() => process.exit(0))
@@ -40,6 +38,9 @@ async function run () {
 
   toDelete = toDelete.concat(
     await pruneDirectory(CONFIG.STORAGE.VIDEOS_DIR, doesWebTorrentFileExist()),
+
+    await pruneDirectory(HLS_STREAMING_PLAYLIST_DIRECTORY, doesHLSPlaylistExist()),
+
     await pruneDirectory(CONFIG.STORAGE.TORRENTS_DIR, doesTorrentFileExist()),
 
     await pruneDirectory(CONFIG.STORAGE.REDUNDANCY_DIR, doesRedundancyExist),
@@ -94,6 +95,10 @@ function doesWebTorrentFileExist () {
   return (filePath: string) => VideoFileModel.doesOwnedWebTorrentVideoFileExist(basename(filePath))
 }
 
+function doesHLSPlaylistExist () {
+  return (hlsPath: string) => VideoStreamingPlaylistModel.doesOwnedHLSPlaylistExist(basename(hlsPath))
+}
+
 function doesTorrentFileExist () {
   return (filePath: string) => VideoFileModel.doesOwnedTorrentFileExist(basename(filePath))
 }
diff --git a/scripts/regenerate-thumbnails.ts b/scripts/regenerate-thumbnails.ts
index 50d06f6fd..a377baa61 100644
--- a/scripts/regenerate-thumbnails.ts
+++ b/scripts/regenerate-thumbnails.ts
@@ -1,13 +1,10 @@
-import { registerTSPaths } from '../server/helpers/register-ts-paths'
-registerTSPaths()
-
 import { map } from 'bluebird'
 import { program } from 'commander'
 import { pathExists, remove } from 'fs-extra'
 import { generateImageFilename, processImage } from '@server/helpers/image-utils'
 import { THUMBNAILS_SIZE } from '@server/initializers/constants'
-import { VideoModel } from '@server/models/video/video'
 import { initDatabaseModels } from '@server/initializers/database'
+import { VideoModel } from '@server/models/video/video'
 
 program
   .description('Regenerate local thumbnails using preview files')
diff --git a/scripts/release.sh b/scripts/release.sh
index 6423d17ee..313087a29 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -76,7 +76,7 @@ rm -f "./client/dist/embed-stats.json"
                           "$directory_name/client/package.json" "$directory_name/config" \
                           "$directory_name/dist" "$directory_name/package.json" \
                           "$directory_name/scripts" "$directory_name/support" \
-                          "$directory_name/tsconfig.json" "$directory_name/yarn.lock")
+                          "$directory_name/yarn.lock")
 
   # temporary setup
   cd ..
@@ -118,3 +118,8 @@ rm -f "./client/dist/embed-stats.json"
       git checkout "$branch"
   fi
 )
+
+# Release types package
+npm run generate-types-package
+cd types/dist
+npm publish --access public
diff --git a/scripts/reset-password.ts b/scripts/reset-password.ts
index 4c45396d4..b2e5639fb 100755
--- a/scripts/reset-password.ts
+++ b/scripts/reset-password.ts
@@ -1,10 +1,7 @@
-import { registerTSPaths } from '../server/helpers/register-ts-paths'
-registerTSPaths()
-
 import { program } from 'commander'
+import { isUserPasswordValid } from '../server/helpers/custom-validators/users'
 import { initDatabaseModels } from '../server/initializers/database'
 import { UserModel } from '../server/models/user/user'
-import { isUserPasswordValid } from '../server/helpers/custom-validators/users'
 
 program
   .option('-u, --user [user]', 'User')
diff --git a/scripts/setup/cli.sh b/scripts/setup/cli.sh
index ea327e5a1..f84260f23 100755
--- a/scripts/setup/cli.sh
+++ b/scripts/setup/cli.sh
@@ -9,8 +9,10 @@ rm -rf ./dist/server/tools/
 (
     cd ./server/tools
     yarn install --pure-lockfile
+    ../../node_modules/.bin/tsc --build --verbose
 )
 
-npm run tsc -- --build ./server/tools/tsconfig.json
 cp -r "./server/tools/node_modules" "./dist/server/tools"
-cp "./tsconfig.json" "./dist"
+
+npm run resolve-tspaths:cli
+npm run resolve-tspaths:server
diff --git a/scripts/test.sh b/scripts/test.sh
index 2dc79c6ce..4d1d8720a 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -2,6 +2,7 @@
 
 set -eu
 
+npm run ci -- types
 npm run ci -- client
 npm run ci -- cli-plugin
 npm run ci -- api-1
diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json
new file mode 100644
index 000000000..0cfd927a6
--- /dev/null
+++ b/scripts/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "../dist/scripts"
+  },
+  "references": [
+    { "path": "../shared" },
+    { "path": "../server" }
+  ]
+}
diff --git a/scripts/update-host.ts b/scripts/update-host.ts
index c6eb9d533..bb54290a4 100755
--- a/scripts/update-host.ts
+++ b/scripts/update-host.ts
@@ -1,10 +1,7 @@
-import { registerTSPaths } from '../server/helpers/register-ts-paths'
-registerTSPaths()
-
+import { updateTorrentMetadata } from '@server/helpers/webtorrent'
+import { getServerActor } from '@server/models/application/application'
 import { WEBSERVER } from '../server/initializers/constants'
-import { ActorFollowModel } from '../server/models/actor/actor-follow'
-import { VideoModel } from '../server/models/video/video'
-import { ActorModel } from '../server/models/actor/actor'
+import { initDatabaseModels } from '../server/initializers/database'
 import {
   getLocalAccountActivityPubUrl,
   getLocalVideoActivityPubUrl,
@@ -12,13 +9,13 @@ import {
   getLocalVideoChannelActivityPubUrl,
   getLocalVideoCommentActivityPubUrl
 } from '../server/lib/activitypub/url'
-import { VideoShareModel } from '../server/models/video/video-share'
-import { VideoCommentModel } from '../server/models/video/video-comment'
 import { AccountModel } from '../server/models/account/account'
+import { ActorModel } from '../server/models/actor/actor'
+import { ActorFollowModel } from '../server/models/actor/actor-follow'
+import { VideoModel } from '../server/models/video/video'
 import { VideoChannelModel } from '../server/models/video/video-channel'
-import { initDatabaseModels } from '../server/initializers/database'
-import { updateTorrentUrls } from '@server/helpers/webtorrent'
-import { getServerActor } from '@server/models/application/application'
+import { VideoCommentModel } from '../server/models/video/video-comment'
+import { VideoShareModel } from '../server/models/video/video-share'
 
 run()
   .then(() => process.exit(0))
@@ -126,7 +123,7 @@ async function run () {
 
     for (const file of video.VideoFiles) {
       console.log('Updating torrent file %s of video %s.', file.resolution, video.uuid)
-      await updateTorrentUrls(video, file)
+      await updateTorrentMetadata(video, file)
 
       await file.save()
     }
@@ -135,7 +132,7 @@ async function run () {
     for (const file of (playlist?.VideoFiles || [])) {
       console.log('Updating fragmented torrent file %s of video %s.', file.resolution, video.uuid)
 
-      await updateTorrentUrls(video, file)
+      await updateTorrentMetadata(playlist, file)
 
       await file.save()
     }