Fix typo at log.rotation.enabled

Tell the clients to not cache the HTML response.

closes #6393

.eslintrc.json

@@ -1,5 +1,6 @@
 {
   "extends": "standard-with-typescript",
+  "root": true,
   "rules": {
     "eol-last": [
       "error",
@@ -39,6 +40,9 @@
       }
     ],
     "quotes": "off",
+
+    "no-constant-binary-expression": "error",
+
     "@typescript-eslint/indent": [
       "error",
       2,
@@ -114,6 +118,8 @@
     "@typescript-eslint/consistent-type-exports": "off",
     "@typescript-eslint/key-spacing": "off",
 
+    "@typescript-eslint/no-unsafe-argument": "off",
+
     "@typescript-eslint/ban-types": [
       "error",
       {
@@ -126,16 +132,20 @@
     ]
   },
   "ignorePatterns": [
-    "node_modules/"
+    "node_modules",
+    "packages/tests/fixtures",
+    "apps/**/dist",
+    "packages/**/dist",
+    "server/dist",
+    "packages/types-generator/tests",
+    "*.js",
+    "/client",
+    "/dist"
   ],
   "parserOptions": {
-    "EXPERIMENTAL_useSourceOfProjectReferenceRedirect": true,
     "project": [
-      "./tsconfig.json",
-      "./shared/tsconfig.json",
-      "./scripts/tsconfig.json",
-      "./server/tsconfig.json",
-      "./server/tools/tsconfig.json"
-    ]
+      "./tsconfig.eslint.json"
+    ],
+    "EXPERIMENTAL_useSourceOfProjectReferenceRedirect": true
   }
 }

.github/CONTRIBUTING.md

@@ -53,13 +53,25 @@ interested in, user interface, design, decentralized architecture...
 You can help to write the documentation of the REST API, code, architecture,
 demonstrations.
 
-For the REST API you can see the documentation in [/support/doc/api](https://github.com/Chocobozzz/PeerTube/tree/develop/support/doc/api) directory.
-Then, you can just open the `openapi.yaml` file in a special editor like [http://editor.swagger.io/](http://editor.swagger.io/) to easily see and edit the documentation. You can also use [redoc-cli](https://github.com/Redocly/redoc/blob/master/cli/README.md) and run `redoc-cli serve --watch support/doc/api/openapi.yaml` to see the final result.
+### User documentation
+
+The official user documentation is available on https://docs.joinpeertube.org/
+
+You can update it by writing markdown files in the following repository: https://framagit.org/framasoft/peertube/documentation/
+
+### REST API documentation
+
+The [REST API documentation](https://docs.joinpeertube.org/api-rest-reference.html) is generated from `support/doc/api/openapi.yaml` file.
+To quickly get a preview of your changes, you can generate the documentation *on the fly* using the following command:
+
+```
+npx @redocly/cli preview-docs ./support/doc/api/openapi.yaml
+```
 
 Some hints:
- * Routes are defined in [/server/controllers/](https://github.com/Chocobozzz/PeerTube/tree/develop/server/controllers) directory
- * Parameters validators are defined in [/server/middlewares/validators](https://github.com/Chocobozzz/PeerTube/tree/develop/server/middlewares/validators) directory
- * Models sent/received by the controllers are defined in [/shared/models](https://github.com/Chocobozzz/PeerTube/tree/develop/shared/models) directory
+ * Routes are defined in [/server/core/controllers/](https://github.com/Chocobozzz/PeerTube/tree/develop/server/core/controllers) directory
+ * Parameters validators are defined in [/server/core/middlewares/validators](https://github.com/Chocobozzz/PeerTube/tree/develop/server/core/middlewares/validators) directory
+ * Models sent/received by the controllers are defined in [/packages/models](https://github.com/Chocobozzz/PeerTube/tree/develop/packages/models) directory
 
 
 ## Improve the website
@@ -88,23 +100,23 @@ First, you should use a server or PC with at least 4GB of RAM. Less RAM may lead
 [the steps](/support/doc/dependencies.md)
 to install the dependencies.
 1) Install [parallel](https://www.gnu.org/software/parallel/) to be able to run tests.
-1) Fork the Github repository.
+1) Fork the GitHub repository.
 1) Run the following commands.
 ```
-$ git clone https://github.com/Chocobozzz/PeerTube
-$ cd PeerTube
-$ git remote add me git@github.com:YOUR_GITHUB_USERNAME/PeerTube.git
-$ yarn install --pure-lockfile
+git clone https://github.com/Chocobozzz/PeerTube
+cd PeerTube
+git remote add me git@github.com:YOUR_GITHUB_USERNAME/PeerTube.git
+yarn install --pure-lockfile
 ```
 
 Note that development is done on the `develop` branch. If you want to hack on
-Peertube, you should switch to that branch. Also note that you have to repeat
+PeerTube, you should switch to that branch. Also note that you have to repeat
 the `yarn install --pure-lockfile` command.
 
 When you create a new branch you should also tell to use your repo for upload
 not default one. To do just do:
 ```
-$ git push --set-upstream me <your branch name>
+git push --set-upstream me <your branch name>
 ```
 
 Then, create a postgres database and user with the values set in the
@@ -121,11 +133,11 @@ Enter password for new role: peertube
 Then enable extensions PeerTube needs:
 
 ```
-$ sudo -u postgres psql -c "CREATE EXTENSION pg_trgm;" peertube_dev
-$ sudo -u postgres psql -c "CREATE EXTENSION unaccent;" peertube_dev
+sudo -u postgres psql -c "CREATE EXTENSION pg_trgm;" peertube_dev
+sudo -u postgres psql -c "CREATE EXTENSION unaccent;" peertube_dev
 ```
 
-Peertube also requires a running redis server, no special setup is needed for
+PeerTube also requires a running redis server, no special setup is needed for
 this.
 
 In dev mode, administrator username is **root** and password is **test**.
@@ -141,7 +153,7 @@ You can get a complete PeerTube development setup with Gitpod, a free one-click
 To develop on the server-side:
 
 ```
-$ npm run dev:server
+npm run dev:server
 ```
 
 Then, the server will listen on `localhost:9000`. When server source files
@@ -157,7 +169,7 @@ More detailed documentation is available:
 To develop on the client side:
 
 ```
-$ npm run dev:client
+npm run dev:client
 ```
 
 The API will listen on `localhost:9000` and the frontend on `localhost:3000`.
@@ -175,7 +187,7 @@ File changes are automatically recompiled, injected in the web browser (no need
 and the web server is automatically restarted.
 
 ```
-$ npm run dev
+npm run dev
 ```
 
 ### Embed
@@ -185,7 +197,7 @@ The generated files (HTML entrypoint and multiple JS and CSS files) are served b
 The following command will compile embed files and run the PeerTube server:
 
 ```
-$ npm run dev:embed
+npm run dev:embed
 ```
 
 ### RTL layout
@@ -193,7 +205,7 @@ $ npm run dev:embed
 To test RTL (right-to-left) layout using `ar` locale:
 
 ```
-$ npm run dev -- --ar-locale
+npm run dev -- --ar-locale
 ```
 
 ### Testing
@@ -211,23 +223,23 @@ Create a PostgreSQL user **with the same name as your username** in order to avo
 Then, we can create the databases (if they don't already exist):
 
 ```
-$ sudo -u postgres createuser you_username --createdb --superuser
-$ createdb -O peertube peertube_test{1,2,3}
+sudo -u postgres createuser you_username --createdb --superuser
+createdb -O peertube peertube_test{1,2,3}
 ```
 
 Build the application and flush the old tests data:
 
 ```
-$ npm run build
-$ npm run clean:server:test
+npm run build
+npm run clean:server:test
 ```
 
 To run 3 nodes:
 
 ```
-$ NODE_APP_INSTANCE=1 NODE_ENV=test npm start
-$ NODE_APP_INSTANCE=2 NODE_ENV=test npm start
-$ NODE_APP_INSTANCE=3 NODE_ENV=test npm start
+NODE_APP_INSTANCE=1 NODE_ENV=test npm start
+NODE_APP_INSTANCE=2 NODE_ENV=test npm start
+NODE_APP_INSTANCE=3 NODE_ENV=test npm start
 ```
 
 Then you will get access to the three nodes at `http://127.0.0.1:900{1,2,3}`
@@ -242,15 +254,6 @@ To test emails with PeerTube:
  * Run [mailslurper](http://mailslurper.com/)
  * Run PeerTube using mailslurper SMTP port: `NODE_CONFIG='{ "smtp": { "hostname": "localhost", "port": 2500, "tls": false } }' NODE_ENV=dev node dist/server`
 
-### OpenAPI documentation
-
-The [REST API documentation](https://docs.joinpeertube.org/api/rest-reference.html) is generated from `support/doc/api/openapi.yaml` file.
-To quickly get a preview of your changes, you can generate the documentation *on the fly* using the following command:
-
-```
-npx @redocly/cli preview-docs ./support/doc/api/openapi.yaml
-```
-
 ### Environment variables
 
 PeerTube can be configured using environment variables.
@@ -278,7 +281,7 @@ You can see the list on the [dedicated documentation](/support/doc/development/l
 
 ### CI
 
-PeerTube uses Github actions to run tests every time a commit is pushed or a PR is opened.
+PeerTube uses GitHub actions to run tests every time a commit is pushed or a PR is opened.
 You can find more information about these tasks on the [dedicated documentation](/support/doc/development/ci.md).
 
 ### Monitoring
@@ -288,11 +291,11 @@ To do so, see the [dedicated documentation](/support/doc/development/monitoring.
 
 ### Test live stream
 
-To easily test a live on PeerTube:
+To easily test a live stream on PeerTube:
  * Enable live support in web admin configuration
  * Create a permanent live on the PeerTube instance
  * Get the **RTMP URL** and the **Live stream key**
- * Send the live to PeerTube using `ffmpeg` using a local video:
+ * Send the live stream to PeerTube using `ffmpeg` using a local video:
 
 ```
 ffmpeg -stream_loop -1 -re -i any-video.mp4 -c copy -f flv rtmp://{RTMP URL}/live/{STREAM KEY}

.github/ISSUE_TEMPLATE/20-documentation-issue.yml

@@ -15,4 +15,4 @@ body:
       description: |
         Are you up to submit a pull request? Chances are, only a small edit is required, so give it a try:
           * Click "Edit this page" if on https://docs.joinpeertube.org
-          * Edit https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/api/openapi.yaml if on https://docs.joinpeertube.org/api/rest-reference.html
+          * Edit https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/api/openapi.yaml if on https://docs.joinpeertube.org/api-rest-reference.html

.github/actions/reusable-prepare-peertube-build/action.yml

@@ -12,12 +12,12 @@ runs:
 
   steps:
     - name: Use Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ inputs.node-version }}
 
     - name: Cache Node.js modules
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           **/node_modules
@@ -29,3 +29,15 @@ runs:
     - name: Install dependencies
       shell: bash
       run: yarn install --frozen-lockfile
+
+    - name: Install peertube runner dependencies
+      shell: bash
+      run: cd apps/peertube-runner && yarn install --frozen-lockfile
+
+    - name: Install peertube CLI dependencies
+      shell: bash
+      run: cd apps/peertube-cli && yarn install --frozen-lockfile
+
+    - name: Display PeerTube dependencies
+      shell: bash
+      run: ls -l node_modules/@peertube

.github/workflows/benchmark.yml

@@ -31,17 +31,18 @@ jobs:
       PGHOST: localhost
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: './.github/actions/reusable-prepare-peertube-build'
         with:
-          node-version: '14.x'
+          node-version: '18.x'
 
       - uses: './.github/actions/reusable-prepare-peertube-run'
 
       - name: Build
         run: |
           startClient=`date +%s`
+          npm run build:server
           npm run build:client
           endClient=`date +%s`
           clientBuildTime=$((endClient-startClient))
@@ -71,7 +72,7 @@ jobs:
 
       - name: Run benchmark
         run: |
-          node dist/scripts/benchmark.js -o benchmark.json
+          npm run benchmark-server -- -o benchmark.json
 
       - name: Display result
         run: |

.github/workflows/codeql.yml

@@ -29,17 +29,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'javascript' ]
+        language: [ 'javascript-typescript' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         config-file: ./.github/workflows/codeql/codeql-config.yml
@@ -51,7 +51,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -65,4 +65,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/codeql/codeql-config.yml

@@ -1,4 +1,6 @@
 name: "PeerTube CodeQL config"
 
 paths-ignore:
- - server/tests
+ - packages/tests
+ - packages/server-commands
+ - packages/types-generator

.github/workflows/docker.yml

@@ -15,7 +15,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: master
       - name: Set matrix for build
@@ -24,8 +24,8 @@ jobs:
           # FIXME: https://github.com/actions/checkout/issues/290
           git fetch --force --tags
 
-          one="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-bullseye\" }"
-          two="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-bullseye,chocobozzz/peertube:$(git describe --abbrev=0)-bullseye\" }"
+          one="{ \"file\": \"./support/docker/production/Dockerfile.bookworm\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-bookworm\" }"
+          two="{ \"file\": \"./support/docker/production/Dockerfile.bookworm\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-bookworm,chocobozzz/peertube:$(git describe --abbrev=0)-bookworm\" }"
           three="{ \"file\": \"./support/docker/production/Dockerfile.nginx\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-webserver:latest\" }"
 
           matrix="[$one,$two,$three]"
@@ -58,7 +58,7 @@ jobs:
 
       -
         name: Checkout develop
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ matrix.ref }}
       -

.github/workflows/nightly.yml

@@ -12,13 +12,13 @@ jobs:
     steps:
       -
         name: Checkout develop
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: develop
 
       - uses: './.github/actions/reusable-prepare-peertube-build'
         with:
-          node-version: '14.x'
+          node-version: '18.x'
 
       - name: Build
         run: npm run nightly

.github/workflows/stats.yml

@@ -18,11 +18,11 @@ jobs:
       CI_BRANCH_BASE: develop
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: './.github/actions/reusable-prepare-peertube-build'
         with:
-          node-version: '16.x'
+          node-version: '18.x'
 
       - name: Angular bundlewatch
         uses: jackyef/bundlewatch-gh-action@master
@@ -36,12 +36,12 @@ jobs:
         run: |
           wget "https://github.com/boyter/scc/releases/download/v3.0.0/scc-3.0.0-x86_64-unknown-linux.zip"
           unzip "scc-3.0.0-x86_64-unknown-linux.zip"
-          ./scc --format=json --exclude-dir .git,node_modules,client/node_modules,client/dist,dist,yarn.lock,client/yarn.lock,client/src/locale,test1,test2,test3,client/src/assets/images,config,storage,server/tests/fixtures,support/openapi,.idea,.vscode,docker-volume,ffmpeg-3,ffmpeg-4 > ./scc.json
+          ./scc --format=json --exclude-dir .git,node_modules,client/node_modules,client/dist,dist,yarn.lock,client/yarn.lock,client/src/locale,test1,test2,test3,client/src/assets/images,config,storage,packages/tests/fixtures,support/openapi,.idea,.vscode,docker-volume,ffmpeg-3,ffmpeg-4 > ./scc.json
 
       - name: PeerTube client stats
         if: github.event_name != 'pull_request'
         run: |
-          node dist/scripts/client-build-stats.js > client-build-stats.json
+          npm run client:build-stats > client-build-stats.json
 
       - name: PeerTube client lighthouse report
         if: github.event_name != 'pull_request'

.github/workflows/test.yml

@@ -46,21 +46,22 @@ jobs:
       PGHOST: localhost
       NODE_PENDING_JOB_WAIT: 250
       ENABLE_OBJECT_STORAGE_TESTS: true
+      ENABLE_FFMPEG_THUMBNAIL_PIXEL_COMPARISON_TESTS: true
       OBJECT_STORAGE_SCALEWAY_KEY_ID: ${{ secrets.OBJECT_STORAGE_SCALEWAY_KEY_ID }}
       OBJECT_STORAGE_SCALEWAY_ACCESS_KEY: ${{ secrets.OBJECT_STORAGE_SCALEWAY_ACCESS_KEY }}
       YOUTUBE_DL_DOWNLOAD_BEARER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: './.github/actions/reusable-prepare-peertube-build'
         with:
-          node-version: '14.x'
+          node-version: '18.x'
 
       - uses: './.github/actions/reusable-prepare-peertube-run'
 
       - name: Cache fixtures
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             fixtures

.gitignore

@@ -1,8 +1,8 @@
 # NPM instalation
-/node_modules/
-/server/tools/node_modules
+node_modules
 *npm-debug.log
 yarn-error.log
+.yarn
 
 # Testing
 /test1/
@@ -11,8 +11,8 @@ yarn-error.log
 /test4/
 /test5/
 /test6/
-/server/tests/fixtures/video_high_bitrate_1080p.mp4
-/server/tests/fixtures/video_59fps.mp4
+/packages/tests/fixtures/video_high_bitrate_1080p.mp4
+/packages/tests/fixtures/video_59fps.mp4
 
 # Production
 /storage
@@ -23,6 +23,7 @@ yarn-error.log
 /ffmpeg-4/
 /thumbnails/
 /torrents/
+/web-videos/
 /videos/
 /previews/
 /logs/
@@ -48,12 +49,14 @@ yarn-error.log
 /*.tar.xz
 /*.asc
 *.DS_Store
-/server/tools/import-mediacore.ts
 /docker-volume/
 /init.mp4
 
 # TypeScript
 *.tsbuildinfo
 
-# Packages
-/packages/types/dist/
+# EsLint
+.eslintcache
+
+# Compiled output
+dist

.mocharc.cjs

@@ -0,0 +1,10 @@
+process.env.TSX_TSCONFIG_PATH = './packages/tests/tsconfig.json'
+
+module.exports = {
+  "node-option": [
+    "import=tsx",
+    "no-warnings",
+    "conditions=peertube:tsx"
+  ],
+  "timeout": 30000
+}

CHANGELOG.md

@@ -1,5 +1,465 @@
 # Changelog
 
+## v6.1.0
+
+### IMPORTANT NOTES
+
+  * You must update nginx configuration: https://github.com/Chocobozzz/PeerTube/blob/develop/support/nginx/peertube
+    * Add `location ~ ^/api/v1/users/[^/]+/imports/import-resumable$ {` block
+  * This release changes the way how PeerTube counts a video view:
+    * Views are taken into account after 10 seconds instead of 30 seconds (can be changed in YAML config)
+    * Views use a *Session ID* generated by the web browser instead of using the request IP (former behavior can be restored in YAML config)
+    * The goal of this change is to get closer to how other video platforms like Mux, Vimeo, or Instagram work
+
+### SECURITY
+
+  * Compact ActivityPub JSON-LD objects before using them to prevent incorrect access control @tesaguri
+  * Protect ActivityPub information related to private/internal/blocked videos
+
+### Admin config (non-exhaustive)
+
+  * **Breaking changes**:
+    * Rename `views.videos.ip_view_expiration` to `views.videos.view_expiration`
+  * YAML & web admin configs:
+    * Add `storyboards.enabled` config to disable storyboard generation
+    * Remove `services.twitter.whitelisted`: Twitter/X doesn't seem to need this anymore. This means that PeerTube will try to inject the video player in Twitter/X by default instead of using a classic image/description
+  * YAML config only:
+    * Add `open_telemetry.metrics.playback_stats_interval` config to customize how often viewers send playback stats to server
+    * Add `views.videos.watching_interval.{anonymous,users}` configs to change how often the web browser sends "is watching" information to the server
+    * Add `stats.registration_requests.enabled` and `stats.abuses.enabled` configs to hide instance registration/abuse requests public stats (average response time, total registration/abuse requests etc.)
+    * Add `stats.total_moderators.enabled` and  `stats.total_admins.enabled`configs to hide total admins/moderators public stats
+    * Add `object_storage.streaming_playlists.store_live_streams` config to not store live stream chunks into object storage (when enabled for streaming playlists)
+    * Set `open_telemetry.metrics.http_request_duration.enabled` to `false` by default to avoid performance issues on the Prometheus backend due to high metric cardinality
+
+### Maintenance
+
+  * Also generate `600x600` and `1500x1500` avatar sizes
+  * Also generate `600x100` banner size
+
+### Plugins/Themes/Embed API
+
+  * Add ability for plugins to create a client custom sub-page in `/my-account` page [#6218](https://github.com/Chocobozzz/PeerTube/pull/6218)
+  * Add access to `req.rawBody` for [plugin routes](https://docs.joinpeertube.org/contribute/plugins#add-custom-routes) [#6300](https://github.com/Chocobozzz/PeerTube/pull/6300)
+  * Add server plugin hooks (https://docs.joinpeertube.org/api/plugins):
+    * `filter:api.user.me.get.result` [#6219](https://github.com/Chocobozzz/PeerTube/issues/6219)
+  * Add `peertubeHelpers.videos.loadByIdOrUUIDWithFiles` helper [#6302](https://github.com/Chocobozzz/PeerTube/pull/6302)
+
+### Features
+
+  * :tada: Implement user import/export :tada: [#6215](https://github.com/Chocobozzz/PeerTube/pull/6215)
+    * This is not a migration tool: data (like channels or videos) is duplicated and not moved from the previous PeerTube instance
+    * Export:
+      * A ZIP is generated by PeerTube and an email is sent to the user when the archive is ready
+      * The archive file contains ActivityPub data for federation compatibility and custom JSON files used by PeerTube import. It also contains video/playlist thumbnail and channel/account avatar/banner files
+      * User can include video files in the archive
+      * Archive files can be stored in object storage
+      * Export can be disabled by the admin. They can also set an expiration time to automatically delete archive files and limit the export file size depending on the user's video quota
+    * Import:
+      * Update account metadata (display name, description...)
+      * Update user settings (video autoplay policy, notification settings...)
+      * Create entries in the mute list
+      * Add watched videos in user's videos history
+      Add likes/dislikes
+      * Send a follow request to imported subscriptions
+      * Create channels, playlists and videos (if the video files are included in the archive)
+      * Admins can disable user import
+  * :tada: Add ability to keep the original video file :tada: [#6157](https://github.com/Chocobozzz/PeerTube/pull/6157)
+    * Can be stored in object storage
+    * Uploader can download the original file
+    * The original file is used in the user export archive (instead of the max quality file)
+  * Add Turkish language support in client
+  * Add ability for admins to set a banner and an avatar to the instance. The banner is used in *About instance*/*Login*/*Register an account* pages. Both the banner and the avatar can be used on the instance homepage using `<peertube-instance-banner>`/`<peertube-instance-avatar>` tag or on external websites/applications like the [JoinPeerTube website](https://joinpeertube.org/instances)
+  * Add ability for uploaders to download and add a video to a playlist on the *My videos* page using the dropdown button [#6008](https://github.com/Chocobozzz/PeerTube/pull/6008)
+  * Video views statistics:
+    * Count a *view* after 10 seconds and use a web browser session id to identify a viewer (see IMPORTANT CHANGES section)
+    * Add information about the location of the viewer subdivision/region
+    * More accurate retention stats where PeerTube doesn't take into account empty views anymore
+  * UI/UX:
+    * Automatically filter on *Local videos* in admin
+    * Add ability to sort videos by file size
+    * Add total video file size column in admin users list
+    * Improve admin runner jobs list by using badges with same colors for type/runner and add *processed/finished* columns
+    * Add *Recommended* tags to recommended PeerTube plugins/themes
+    * Improve plugins/themes default trending sort
+    * Trim username on login
+    * Warn if "Forgot password" email contains uppercase
+    * Use more precise buttons label to save changes in *My account* settings
+    * Add icon to owners/moderators only options
+    * Always use short UUIDs instead of full UUIDs in client to prevent URL confusion
+    * Add average admins/moderators response time in *Request an account* page
+    * Add color to registration/abuse state icon
+  * Player:
+    * Add an enable/disable subtitle button to the control bar
+    * Faster auto-resizing of the player when the video has a custom aspect ratio (only for videos uploaded on PeerTube >= 6.1)
+    * Use video aspect ratio for responsive embeds (only for videos uploaded on PeerTube >= 6.1)
+  * Performance:
+    * Optimize *watching* (`/api/v1/videos/:videoId/views`) endpoint
+    * Reduce `ffprobe` calls when not needed resulting in faster live stream transcoding startup and CPU/IO reduction during video upload/import
+  * Federation
+    * Introduce a new way to federate `Views` events in the federation. See [the commit details](https://github.com/Chocobozzz/PeerTube/commit/b4f4432459f22994cb8fa667c862a0edd7af0ebc) for more information
+    * Implements [FEP-2677](https://codeberg.org/fediverse/fep/src/branch/main/fep/2677/fep-2677.md) to identify the `Application` `Actor`
+    * Add Lemmy `postingRestrictedToMods` information to channels AP objects
+  * Improve generated video thumbnail quality
+  * Add notification when a subscribed video channel is live streaming
+  * Support `itunes:owner` in podcast feed
+
+### Bug fixes
+
+  * Add stripes to square video thumbnails too (like we do for portrait videos)
+  * Prevent channels from being displayed multiple times on the *My channels* page
+  * Stricter video timestamp "linkification"
+  * Correctly fix downloading video files from object storage with some video names
+  * Fix broken RSS feed in some (rare) cases
+  * Fix local jobs count/pagination with *Waiting* jobs
+  * Banned users cannot live stream anymore
+  * Correctly escape HTML entities in meta tags [#6206](https://github.com/Chocobozzz/PeerTube/pull/6206)
+  * Fix broken account channels page with high `video_channels.max_per_user` config
+  * Add ability for moderators to approve/reject user registrations
+  * Do not display empty notification settings group
+  * Correctly fix WebTorrent video import crash
+  * Fix video channel synchronization crash on remote channels/playlists that contain hidden videos (unavailable, deleted etc.)
+  * Ensure the filename doesn't contain `/` character when downloading a video
+  * Fix Google Search SEO (with `Video is not the main content of the page` error)
+  * Remove password autocomplete in embed which causes issues when the parent page has a password input and the user uses the web browser's password autofill feature
+  * Don't submit the login form on forgot my password keyboard click
+  * Fix storyboard generation with some videos
+  * Fix ffmpeg encoder after custom plugin transcoding profile deletion
+  * Fix navigating from one channel related page (playlist, videos...) to another one
+  * More robust live stream transcoded by a remote runner
+  * Fix first video in playlist that doesn't start at "starts at"
+  * Fix embed HTML code for videos/playlists that have passwords
+  * Display external account/channel playlists if user is allowed to escape the federation
+  * Fix view endpoint crash on geoip update failure
+  * Fix setting video subtitle from URL query
+  * Fix selecting "Display all languages/categories/licences" in videos search resulting in an empty search
+  * Fix followers/following counter of local ActivityPub actors
+  * Fix notification button link on mobile
+  * Fix player subtitles on iOS
+
+
+## v6.0.4
+
+### IMPORTANT NOTES
+
+ * If you upgrade from PeerTube **< v6.0.0**, please follow v6.0.0 IMPORTANT NOTES
+ * If you upgrade from PeerTube **v6.0.0**, please follow v6.0.1 IMPORTANT NOTES
+
+### SECURITY
+
+ * **Important:** Prevent XSS injection in embed. Thanks [Syst3m0ver](https://www.linkedin.com/in/ahmed-hasnaoui-790618180) and [aramido GmbH](https://aramido.de/sicherheitspruefung/penetrationstest)!
+
+
+## v6.0.3
+
+### IMPORTANT NOTES
+
+ * If you upgrade from PeerTube **< v6.0.0**, please follow v6.0.0 IMPORTANT NOTES
+ * If you upgrade from PeerTube **v6.0.0**, please follow v6.0.1 IMPORTANT NOTES
+
+### SECURITY
+
+ * Prevent nginx from serving private/internal/password protected HLS video static files
+   * You must update your nginx configuration like in [this commit](https://github.com/Chocobozzz/PeerTube/commit/12ea8f0dd11e3fb5fbb8955f5b7d52f27332d619#diff-be9f96b9b1de67284047e610821493f9a5bec86bfcdf81a7d8d6e7904474c186) (line `202` replace `location ~ ^(/static/(webseed|web-videos|streaming-playlists)/private/)|^/download {` by `location ~ ^(/static/(webseed|web-videos|streaming-playlists/hls)/private/)|^/download {`)
+
+### Bug fixes
+
+ * Fix HTML meta tags with attributes that contain quotes
+ * Fix time parsing resulting in broken video start time in some cases
+ * Fix WebTorrent video import crash
+ * Reload *Discover* page on logout
+ * Fix privacy error when updating a live, even if the privacy has not changed
+ * Fix invalid remote live state change notification that causes the player to reload
+ * Don't apply big play button skin to settings menu
+ * Fix downloading video files from object storage with some video names (that include emojis, quotes etc)
+ * Fix thumbnail generation when ffmpeg cannot seek the input
+ * Fix theme colors on stats page
+ * Fix input mask (used for chapters, playlist timecodes...) with 10h+ videos
+ * Fix chapter *position* width consistency
+ * Fix player ratio with audio only videos
+ * Also update video playlist URLs when using `update-host` script
+ * Fix upload/import/update of videos that contain multiple chapters with the same timecode
+
+
+## v6.0.2
+
+### IMPORTANT NOTES
+
+ * If you upgrade from PeerTube **< v6.0.0**, please follow v6.0.0 IMPORTANT NOTES
+ * If you upgrade from PeerTube **v6.0.0**, please follow v6.0.1 IMPORTANT NOTES
+
+### Bug fixes
+
+ * Fix upgrade.sh when Peertube is installed outside the standard path [#6064](https://github.com/Chocobozzz/PeerTube/pull/6064)
+ * Fix importing videos with too long chapter name
+ * Don't create chapters from description if there is only one
+ * Ensure user is owned by the auth plugin before updating its attributes
+ * Improve channels and accounts SEO by fixing structured JSON-LD data and canonical URLs
+ * Originally published and reupload date format consistency in watch page
+ * Fix cpu count when cpu info not available
+ * Fix embed when waiting for a live
+ * Fix updating already started live if live attributes don't change
+ * Fix displaying many countries in video stats
+
+
+## v6.0.1
+
+### IMPORTANT NOTES
+
+ * If you upgrade from PeerTube **< v6.0.0**, please follow v6.0.0 IMPORTANT NOTES
+ * We've made some modifications in v6.0.0 IMPORTANT NOTES, so if you upgrade from PeerTube v6.0.0:
+   * Ensure `location = /api/v1/videos/upload-resumable {` has been replaced by `location ~ ^/api/v1/videos/(upload-resumable|([^/]+/source/replace-resumable))$ {` in your nginx configuration
+   * Ensure you updated `storage.web_videos` configuration value to use `web-videos/` directory name
+   * Ensure your directory name on filesystem is the same as `storage.web_videos` configuration value: directory on filesystem must be renamed from `videos/` to `web-videos/` to represent the value of `storage.web_videos`
+
+### Bug fixes
+
+ * Fix CPU going to 100% on odd cpu count
+ * Increase storyboard generation job TTL
+ * Add missing `generate-video-storyboard` job type in admin jobs list
+ * Regenerate storyboard after studio job
+
+
+## v6.0.0
+
+### IMPORTANT NOTES
+
+We have many important notes in this release. We know it's a pain for sysadmin, but consider each one as a major step forward for PeerTube quality!
+
+#### Sysadmins important notes
+
+  * Remove NodeJS 16 support (see https://nodejs.org/fr/blog/announcements/nodejs16-eol):
+    * Please upgrade to NodeJS 18 before upgrading PeerTube
+    * If you use NodeSource repository, you may have to migrate to their new repository: https://github.com/nodesource/distributions/wiki/How-to-migrate-to-the-new-repository
+    * Check in `production.yaml` that you use `127.0.0.1` instead of `localhost` for `listen.hostname`, `database.hostname` and `redis.hostname` as Node 18 favours IPv6 for `localhost` resolution
+
+  * Remove WebTorrent support in player:
+    * "WebTorrent videos" are renamed to "Web Video". The video format is the same, we just stop to use P2P for these videos
+    * There is no "Auto" quality anymore for Web Videos. The viewer has to explicitly choose the video resolution
+    * We still use P2P with the HLS player, which is the recommended transcoding format since several versions
+    * See https://github.com/Chocobozzz/PeerTube/issues/5465 for more information
+
+  * Configuration key that you must update in your `production.yaml` if not automatically done by your upgrade script:
+    * `storage.videos` must be **renamed** to `storage.web_videos`: https://github.com/Chocobozzz/PeerTube/blob/develop/config/production.yaml.example#L151
+    * Configuration value of `storage.web_videos` must have the directory name to be **changed** from `videos/` to `web-videos/`: https://github.com/Chocobozzz/PeerTube/blob/develop/config/production.yaml.example#L151
+    * Directory on filesystem must be **renamed** from `videos/` to `web-videos/` to represent the value of `storage.web_videos`
+      * Classic installation: `sudo -u peertube mv '/var/www/peertube/storage/videos/' '/var/www/peertube/storage/web-videos/'`
+      * Docker installation: `mv '/path-to-docker-installation/docker-volume/data/videos/' '/path-to-docker-installation/docker-volume/data/web-videos/'`
+    * `transcoding.webtorrent` must be **renamed** to `transcoding.web_videos`: https://github.com/Chocobozzz/PeerTube/blob/develop/config/production.yaml.example#L532
+    * `object_storage.videos` must be **renamed** to `object_storage.web_videos`. The value of `object_storage.web_videos.bucket_name` doesn't need to be changed: https://github.com/Chocobozzz/PeerTube/blob/develop/config/production.yaml.example#L223
+    * `storage.storyboards` must be **added**: https://github.com/Chocobozzz/PeerTube/blob/develop/config/production.yaml.example#L157
+
+  * PeerTube Docker image now uses `bookworm`. `chocobozzz/peertube:production-bullseye` needs to be replaced by `chocobozzz/peertube:production-bookworm`
+
+  * Env configuration that your must update if you use Docker:
+    * `PEERTUBE_TRANSCODING_WEBTORRENT_ENABLED` must be **renamed** to `PEERTUBE_TRANSCODING_WEB_VIDEOS_ENABLED`
+    * `PEERTUBE_OBJECT_STORAGE_VIDEOS_BUCKET_NAME` must be **renamed** to `PEERTUBE_OBJECT_STORAGE_WEB_VIDEOS_BUCKET_NAME`
+    * `PEERTUBE_OBJECT_STORAGE_VIDEOS_PREFIX` must be **renamed** to `PEERTUBE_OBJECT_STORAGE_WEB_VIDEOS_PREFIX`
+    * `PEERTUBE_OBJECT_STORAGE_VIDEOS_BASE_URL` must be **renamed** to `PEERTUBE_OBJECT_STORAGE_WEB_VIDEOS_BASE_URL`
+
+  * You must update nginx configuration: https://github.com/Chocobozzz/PeerTube/blob/develop/support/nginx/peertube
+    * `location ~ ^/static/(thumbnails|avatars)/ {` block must be removed
+    * `location = /api/v1/videos/upload-resumable {` must be updated to `location ~ ^/api/v1/videos/(upload-resumable|([^/]+/source/replace-resumable))$ {`
+    * `location ~ ^(/static/(webseed|streaming-playlists)/private/)|^/download {` must be updated to `location ~ ^(/static/(webseed|web-videos|streaming-playlists)/private/)|^/download {`
+    * `location ~ ^/static/(webseed|redundancy|streaming-playlists)/ {` must be updated to `location ~ ^/static/(webseed|web-videos|redundancy|streaming-playlists)/ {`
+
+  * Tracing requires `--experimental-loader=@opentelemetry/instrumentation/hook.mjs` node option: https://github.com/Chocobozzz/PeerTube/blob/develop/config/production.yaml.example#L264
+
+#### Developers important notes
+
+  * REST API breaking changes:
+    * Removed `webtorrentEnabled` from user response (deprecated since 4.1 in favour of `p2pEnabled`)
+    * Removed `avatar` and `banner` fields from account/channel responses (deprecated since 4.2 in favour of `avatars` and `banners`)
+    * Removed `filter` query when listing videos (deprecated since 4.0 in favour of `isLocal` and `include`)
+    * Deprecate `/api/v1/videos/:id/webtorrent` video file routes in favour of `/api/v1/videos/:id/web-videos` routes
+    * Deprecate `hasWebtorrentFiles` body video filter in favour of `hasWebVideoFiles` when listing videos
+    * Deprecate `webtorrent` `transcodingType` in favour of `web-video` in `/api/v1/videos/{id}/transcoding` route
+    * `currentTime` is now required to notify the user is watching the video using `/api/v1/videos/{id}/views` (introduced in 4.2)
+
+  * Static server paths breaking changes:
+    * `/static/webseed/...` is deprecated in favour of `/static/web-videos/...`
+    * `/object-storage-proxy/webseed/...` is deprecated in favour of `/object-storage-proxy/web-videos/...`
+    * `/static/thumbnails/...` is deprecated in favour of `/static/lazy-thumbnails/...`
+
+  * Plugin API breaking changes:
+    * Deprecated `webtorrent` key in `getFiles()` helper result. Use `webVideo` instead
+
+
+### CLI tools
+
+  * Removed unmaintained `peertube-import-videos` (also aliased as `peertube import-videos` or `peertube import`) script
+  * PeerTube remote CLI is much more simpler to install using NPM: https://docs.joinpeertube.org/maintain/tools#remote-peertube-cli
+  * Support moving video files from object storage to filesystem: https://docs.joinpeertube.org/maintain/tools#move-video-files-from-object-storage-to-filesystem
+
+### Features
+
+  * :tada: **Add "Password protected" video privacy** [#5836](https://github.com/Chocobozzz/PeerTube/pull/5836) :tada:
+    * A single password can be set using the web interface at video upload/import/update
+    * The [REST API](https://docs.joinpeertube.org/api-rest-reference.html#tag/Video-Passwords) can store as many passwords as you want, allowing developers to use this feature to easily give or revoke access to a video *on the fly*
+    * Developers that use PeerTube embeds can set the video password using [the embed API](https://docs.joinpeertube.org/api/embed-player#setvideopassword-promise-void)
+  * :tada: **Add video storyboard support** :tada:
+    * PeerTube automatically generates a storyboard on video upload/import
+    * Viewers can see the image around the targeted timecode when hovering the progress bar
+    * Storyboard of videos uploaded/imported before v6 can be generated by the admin using `npm run create-generate-storyboard-job` command: https://docs.joinpeertube.org/maintain/tools#generate-storyboard
+  * :tada: **Add ability for users to replace their video file** :tada:
+    * Has to be enabled by the PeerTube instance administrator
+    * The user can replace the video file in the *Update Video* page
+    * The *re-upload* date is displayed under the video player
+  * :tada: **Add video chapters support** :tada:
+    * Add chapters in the upload/import/update video page or let PeerTube automatically imports them from the video container/youtube-dl
+    * Markers are displayed in the player progress bar to symbolize a chapter
+    * Chapter title is displayed when hovering/touching the player progress bar
+  * Better video player:
+    * More efficient as we don't rebuild the player every time the played video changes
+    * The player keeps the current player settings (playback speed, fullscreen...) when the played video changes
+    * Automatically adjust the player size to match video ratio
+  * Improve SEO and video link sharing:
+    * Use short video/channel/account URLs in sitemap and for canonical tags
+    * Add JSON-LD tag in embed page
+    * Embed page does not forbid indexation anymore: we use a canonical tag instead that targets the watch page
+    * Forbid indexation of remote videos, accounts and channels (instead of providing an invalid canonical tag)
+    * Truncate OpenGraph/Twitter card link description
+  * Fix client accessibility and keyboard navigation:
+    * Fix links in bootstrap alerts color
+    * Better input placeholder contrast
+    * Fix video miniature link label
+    * Add ability to disable hotkeys
+    * Improve table overall accessibility
+    * Wrap icons that can lead to an action inside buttons
+    * Fix left menu admin/my-library menu accessibility
+    * And many more improvements!
+  * Improve remote runner management:
+    * Add ability to remove runner jobs
+    * Add runner job state quick filter
+    * Merge registration tokens and runners tables in same page
+    * Add copy button to copy registration token
+  * Add ability for admins to force transcoding on a specific video even if it's in broken state (stuck in *To Transcode* for example)
+  * Add an option to sign federated fetches (ActivityPub based software such as Mastodon may require it to access content)
+  * Download video file directly from S3 using pre signed URLs
+  * Lazy download remote video thumbnails to reduce storage
+  * Improve recommended videos when the watched video doesn't have tags set
+  * Add more rate limits in configuration (`plugins`, `well-known`, `feeds`, `activity_pub` and `client` endpoints)
+  * Add ability to reset video *Originally published at* attribute
+  * Add ability for admins to set the default user channel name [#6000](https://github.com/Chocobozzz/PeerTube/pull/6000)
+  * Server now uses [ESM modules](https://nodejs.org/api/esm.html)
+  * Add worker threads Prometheus metrics
+  * Performance:
+    * Process unicast HTTP job in worker threads
+    * Sign ActivityPub requests in worker threads
+    * Optimize recommended videos HTTP request
+    * Optimize videos SQL queries when filtering on lives or tags
+    * Optimize `/videos/{id}/views` endpoint with many viewers
+    * Add ability to disable PeerTube HTTP logs
+    * Optimize homepage videos HTTP queries
+
+
+### Bug fixes
+
+  * Don't cache upload response if the video has been deleted
+  * Fix broken upgrade script when using custom database port
+  * Prevent duplicate runner names
+  * Avoid runner job update error
+  * Notify remote runners there are available jobs when a job is aborted/errored
+  * Fix updating P2P settings in left menu
+  * Fix 500 HTTP error on invalid short UUID conversion
+  * Don't display admin email in `security.txt` well-known endpoint
+  * Optimize `update-host` script to fix out of memory error
+  * Fix error log when using an unconventional distribution of FFmpeg with a non-standard version string [#5917](https://github.com/Chocobozzz/PeerTube/pull/5917)
+  * Fix live replay REST API breaking change: `replaySettings.privacy` is not required anymore
+  * Fix broken live replay when updating replay privacy
+  * More robust *About* page when getting category from server
+  * Fix `ERR_HTTP_HEADERS_SENT` crash
+  * Avoid illegal characters in torrent filename
+  * Avoid federation error log with remote `Like` on `Note`
+  * Fix atom feed with *Science & Technology* category
+  * Support empty value returned by `filter:api.video.get.result` hook
+  * Prevent remote subscribe on accounts (not yet supported by PeerTube)
+  * Fix feed audio file mimetype
+  * Fix video quality on high video resolution/fps
+  * Fix disabling Object Storage ACL using Docker env `PEERTUBE_OBJECT_STORAGE_UPLOAD_ACL_PUBLIC` and `PEERTUBE_OBJECT_STORAGE_UPLOAD_ACL_PRIVATE` in `.env`
+  * Correctly end live session on ffprobe error
+  * Fix video stats X axis with old videos
+  * Fix empty master playlist upload on s3
+  * Correctly generate `production.yaml.new` that should merge your current `production.yaml` with new keys defined by PeerTube
+  * Fix card font color theme
+  * Respect "transcode original resolution" setting when using remote runners
+  * Prevent player mobile buttons flickering
+  * Fix graph zooming end date
+
+
+## v5.2.1
+
+### Bug fixes
+
+ * Fix loading spinner displayed forever on Chrome
+ * Fix broken replay with long live name
+ * Fix fps transcoding on remote runners
+ * Fix terms/code of conduct link toggle
+
+
+## v5.2.0
+
+### IMPORTANT NOTES
+
+  * **Important** Remove NodeJS 14 support
+  * **Important** You must update your nginx configuration to support remote runners: https://github.com/Chocobozzz/PeerTube/blob/develop/support/nginx/peertube#L101
+  * Add `storage.tmp_persistent` directory in configuration file. **You must configure it in your production.yaml**: https://github.com/Chocobozzz/PeerTube/blob/develop/config/production.yaml.example#L148
+  * PeerTube requires **Docker Compose >= v2** for Docker compose installation
+
+### Maintenance
+
+  * Remove `npm run create-transcoding-job` and `npm run print-transcode-command` unmaintained scripts
+  * Add Redis sentinel support [#5593](https://github.com/Chocobozzz/PeerTube/pull/5593)
+  * Improve upgrade script (used when you will upgrade from PeerTube 5.2 to its next version) for classic installation:
+    * Automatically generate a `config/production.yaml.new` file after the upgrade, which is the fusion between the new PeerTube configuration keys and your current `production.yaml`. After a review you can replace your old `config/production.yaml` with this new file so you don't have to add new keys manually
+    * Add `ls` option compatibility with FreeBSD [#5785](https://github.com/Chocobozzz/PeerTube/pull/5785)
+
+### Docker
+
+  * Make database name configurable using env variable [#5734](https://github.com/Chocobozzz/PeerTube/pull/5734)
+
+### Plugins/Themes/Embed API
+
+  * Add `filter:html.client.json-ld.result` hook
+
+### Features
+
+  * :tada: Implement remote transcoding for VOD videos, Live streams and Studio editions :tada: [#5769](https://github.com/Chocobozzz/PeerTube/pull/5769)
+    * If enabled, remote PeerTube runners can process these high CPU jobs
+    * Admin documentation: https://docs.joinpeertube.org/admin/remote-runners
+    * PeerTube runner CLI documentation: https://docs.joinpeertube.org/maintain/tools#peertube-runner
+    * Demonstration video: https://peertube2.cpy.re/w/oJwHHYwt4oKjKhLNh2diAY
+    * Architecture documentation: https://docs.joinpeertube.org/contribute/architecture#remote-vod-live-transcoding
+  * Add Podcast RSS feed support: [#5487](https://github.com/Chocobozzz/PeerTube/pull/5487)
+  * Add ability to set custom privacy for live replays [#5692](https://github.com/Chocobozzz/PeerTube/pull/5692)
+  * Render images of markdown fields in *About* page [#5732](https://github.com/Chocobozzz/PeerTube/pull/5732)
+  * Admin can disable user video history by default [#5728](https://github.com/Chocobozzz/PeerTube/pull/5728)
+  * Improve global accessibility
+
+### Bug fixes
+
+  * Fix live stream object storage sync resulting in broken playback on iOS after a few minutes
+  * Correctly proxify HTTP 206 content-range header from object storage [#5703](https://github.com/Chocobozzz/PeerTube/pull/5703)
+  * Filter out already watched videos from recommended videos [#5739](https://github.com/Chocobozzz/PeerTube/pull/5739)
+  * Prevent exception when HTTP headers are already sent
+  * Fix remote instance following/followers links in about page
+  * Prevent error when updating a running live stream if the privacy hasn't changed
+  * Prevent crash on plugin websocket error
+  * Don't call `register`/`unregister` plugin API when installing/uninstalling plugins using `script/plugin` scripts (offline mode)
+  * Fix error on missing plugin CSS file at PeerTube startup [#5746](https://github.com/Chocobozzz/PeerTube/pull/5746)
+  * Prevent "invalid end watch section" server log warnings
+  * Support remote subscribe with a handle starting with a `@` character
+  * Actor preferred username (account/channel handle) is now case insensitive
+  * Fix RTL layout inconsistencies
+  * Prevent user video notification when the subscription is still in *Pending* state
+  * Correctly remove *Pending* subscription
+  * Fix PeerTube subtitles import
+  * Fix languages alphabetical order
+  * Fix registration notification error
+  * Correctly unload plugin paths
+  * Fix custom default route in instance logo link
+  * Fix video channels quick filter overflow
+
+
 ## v5.1.0
 
 ### IMPORTANT NOTES
@@ -52,7 +512,7 @@
 
  * :tada: Implement user registration approval (https://docs.joinpeertube.org/admin/managing-users#registration-approval) [#5544](https://github.com/Chocobozzz/PeerTube/pull/5544)
    * If enabled, the user has to fill a *Registration reason* input
-   * Moderators have to to accept/reject the registration with a *Moderation response* that will be sent by email to the user
+   * Moderators have to accept/reject the registration with a *Moderation response* that will be sent by email to the user
    * If the registration is accepted, the user and its channel are automatically created
  * Add "back to live" button in player
    * The *Live* button is red when the player is synced with the live
@@ -155,7 +615,9 @@
    * Classic installation: `cd /var/www/peertube/peertube-latest && sudo -u peertube NODE_CONFIG_DIR=/var/www/peertube/config NODE_ENV=production node dist/scripts/migrations/peertube-5.0.js`
    * Docker installation: `cd /var/www/peertube-docker && docker-compose exec -u peertube peertube node dist/scripts/migrations/peertube-5.0.js`
  * Configuration changes (`config/production.yaml`):
-   * There is a new `secrets.peertube` configuration. You must fill it before running PeerTube v5: https://github.com/Chocobozzz/PeerTube/blob/v5.0.0/config/production.yaml.example#L14
+   * There is a new `secrets.peertube` configuration:
+     * Classic install: fill it before running PeerTube v5: https://github.com/Chocobozzz/PeerTube/blob/v5.0.0/config/production.yaml.example#L14
+     * Docker install: fill it using an env variable before running the containers: https://github.com/Chocobozzz/PeerTube/blob/develop/support/docker/production/.env#L27
    * `object_storage.upload_acl` is now a parent key that you must update: https://github.com/Chocobozzz/PeerTube/blob/v5.0.0/config/production.yaml.example#L153
  * You must update your nginx configuration:
    * We introduced a new `location` for plugin websocket routes: https://github.com/Chocobozzz/PeerTube/blob/v5.0.0/support/nginx/peertube#L135
@@ -448,7 +910,7 @@
  * **Important** SQL migrations (in particular `0685-multiple-actor-images`) can take several minutes to complete
  * **Important** You must update your nginx configuration to support video web editor: https://docs.joinpeertube.org/install/any-os#nginx
  * REST API:
-   * `PUT /api/v1/videos/{id}/watching` is deprecated, use `POST /api/v1/videos/videos/{id}/views` instead: https://docs.joinpeertube.org/api/rest-reference.html#operation/addView
+   * `PUT /api/v1/videos/{id}/watching` is deprecated, use `POST /api/v1/videos/videos/{id}/views` instead: https://docs.joinpeertube.org/api-rest-reference.html#operation/addView
 
 ### Maintenance
 
@@ -1602,7 +2064,7 @@ A new endpoint to report videos will be created in PeerTube 2.4 and will also al
 
 ### Features
 
- * :tada: Add global search support (has to be explicitely enabled by admins)
+ * :tada: Add global search support (has to be explicitly enabled by admins)
  * :tada: Add ability for admins to display a banner on their instance
  * :tada: Support Vietnamese and Kabyle languages. Also re-establish Occitan language locale despite lack of support in Angular
  * Federation:
@@ -2923,8 +3385,8 @@ This version is a pre release because it contains many important changes, and re
 **Important:** Before upgrading run the following commands (no need to stop PeerTube) on your PeerTube database (in this example it's *peertube_prod*):
 
 ```
-$ sudo -u postgres psql peertube_prod -c 'CREATE EXTENSION IF NOT EXISTS unaccent;'
-$ sudo -u postgres psql peertube_prod -c 'CREATE EXTENSION IF NOT EXISTS pg_trgm;'
+sudo -u postgres psql peertube_prod -c 'CREATE EXTENSION IF NOT EXISTS unaccent;'
+sudo -u postgres psql peertube_prod -c 'CREATE EXTENSION IF NOT EXISTS pg_trgm;'
 ```
 
 You will need [PostgreSQL Contrib](https://www.postgresql.org/docs/9.6/static/contrib.html).

CODE_OF_CONDUCT.md

@@ -7,7 +7,6 @@ In order to create an open and welcoming environment, we as contributors and mai
 * age
 * body size
 * disability
-* ethnicity
 * gender identity and expression
 * level of experience
 * education
@@ -63,7 +62,7 @@ We also reserve the right to temporarily or permanently ban any contributor for
 
 ## Scope
 
-This code of conduct applies whenever you are representing the project or community. For example you may be:
+This code of conduct applies whenever you are representing the project or community. For example, you may be:
 
 * working in a project space online or in the public (i.e.: github.com, framacolibri.org, IRC)
 * using an official project email address

CREDITS.md

@@ -6,48 +6,55 @@
  * Александр
  * T.S
  * Hồ Nhất Duy
- * Berto Te
- * Filip Bengtsson
  * josé m
  * Jeff Huang
- * Simon Brosdetzko
- * kontrollanten
  * Ihor Hordiichuk
+ * Filip Bengtsson
+ * Payman Moghadam
+ * Berto Te
+ * Simon Brosdetzko
  * Jiri Podhorecky
+ * Milo Ivir
+ * kontrollanten
+ * Phongpanot
+ * GunChleoc
  * hecko
  * Laurent Ettouati
  * kimsible
- * Phongpanot
  * Zet
- * GunChleoc
+ * Sveinn í Felli
+ * Aitor Salaberria
  * Clemens Schielicke
  * Racida S
+ * Ewout van Mansom
  * Marcin Mikołajczak
  * Eivind Ødegård
- * Milo Ivir
- * Ewout van Mansom
+ * Balázs Meskó
  * Tirifto
- * Kim
+ * Wicklow
  * Hannes Ylä-Jääski
- * Mohamad Reza
- * Vodoyo Kamal
+ * Kim
  * Armin
- * Kimsible
- * Sveinn í Felli
+ * Fontan 030
+ * John Livingston
+ * Vodoyo Kamal
+ * Mohamad Reza
  * Besnik Bleta
+ * Kimsible
  * Felix Ableitner
  * Frank Sträter
- * John Livingston
+ * Free coss
  * Quentin PAGÈS
  * Gérald Niel
+ * Luca Calcaterra
+ * ButterflyOfFire
  * Duy
  * Slimane Selyan AMIRI
- * ButterflyOfFire
  * Dingzhong Chen
+ * Eric Guichaoua
+ * Julien Maulny
  * Mark Van den Borre
  * x
- * Julien Maulny
- * Balázs Meskó
  * Jorropo
  * Josh Morel
  * Manuel Viens
@@ -56,27 +63,30 @@
  * Elegant Codes
  * Florian CUNY
  * Francesc
- * Luca Calcaterra
- * Payman Moghadam
+ * Renne Rocha
  * mando laress
  * Артём Котлубай
+ * Ettore Atalan
+ * Ricardo Biloti
+ * Blood Axe
  * Cedric F
  * Florent
  * Marc Strange
- * Renne Rocha
  * Ch
  * J. Lavoie
  * barzofarev2
  * jan Seli
  * lutangar
+ * 李奕寯
+ * 0que
  * Martin Hoefler
  * Porrumentzio
  * Poslovitch
  * Xabi
  * buoyantair
- * 李奕寯
+ * Alexander Ivanov
  * Balázs Úr
- * Eric Guichaoua
+ * Echo Kilo
  * Jan Keromnes
  * Luc Didry
  * Siourdakis Thanos
@@ -86,18 +96,21 @@
  * Caroline Chuong
  * David Soh
  * Diazepan Medina
+ * Erik Guldberg
  * Jason Zhou
  * Loukas Stamellos
  * Ms Kimsible
+ * NorbiPeti
+ * Sergey Zigachev
  * Thomas Citharel
+ * Txopi
  * Benjamin Bouvier
+ * Filip Hanes
  * Joe Bill
  * Kemal Oktay Aktoğan
  * Lucas Declercq
  * Sirxy
- * chris@famichiki.tube
  * matograine
- * Alexander Ivanov
  * Daniel Santos
  * David Libeau
  * Ewald Arnold
@@ -105,26 +118,31 @@
  * Jayme Soares Almeida Cruz
  * Kempelen
  * Nassim Bounouas
- * NorbiPeti
  * Rafael Fontenelle
- * Sergey Zigachev
  * Thomas Kuntz
  * Tzafrir Cohen
  * Viorel-Cătălin Răpițeanu
+ * Vri
  * miro
+ * nexi
  * owiox8+1viroxeaziaxw@sharklasers.com
  * Adrià Martín
  * Ahmed ABERWAG
  * Anne-Gaelle Moulun
  * Arman
+ * Asier Iturralde Sarasola
  * BRAINS YUM
  * Belkacem Mohammed
  * Côme 744
  * Dimitri Gilbert
+ * Flavio F. M
  * Florent Poinsaut
  * Frank Chang
  * Green-Star
+ * I_Automne
+ * Ilia
  * Micah Elizabeth Scott
+ * Pierre-Jean
  * Ret Samys
  * SVNET Libre
  * Tomasz
@@ -132,6 +150,7 @@
  * William Lahti
  * Wirebrass
  * Yury Bulka
+ * alex gabilondo
  * boris joeson
  * frankstrater
  * mater
@@ -141,24 +160,26 @@
  * Ajeje Brazorf
  * Andrey
  * Angristan
+ * Benjamin Seitz
  * Bob Oob
  * Booteille
- * Chris Sakura 佐倉くりす on Youtube
+ * Cokelat8
  * DontUseGithub
- * I_Automne
+ * Farooq Karimi Zadeh
  * Iñigo
+ * Jim Kats
  * Joan Montané
  * Kristoffer Grundström
  * LecygneNoir
  * Lukas
  * MahdiTurki
  * Martijn Dekker
+ * Mats Blomdahl
  * Maxime Louet
  * Mildred
  * Nikolay
  * Okhin
  * Pierre-Alain TORET
- * Pierre-Jean
  * Serge Victor
  * Théo Le Calvar
  * Ugaitz
@@ -171,13 +192,14 @@
  * roberto marcolin
  * Ahsan Haris Ahmed
  * Alberto Teira
+ * Alejandro
  * Alex
  * Aliaksandr Hrankin
+ * Anael González Paz
  * Andréas Livet
  * Andrés Maldonado
  * Arco
  * Armin Kunkel
- * Asier Iturralde Sarasola
  * Asr128
  * Aurélien Bertron
  * Axel Viala
@@ -187,7 +209,6 @@
  * Eder Etxebarria
  * Ehsan Gholami
  * Elga Ahmad Prayoga
- * Farooq Karimi Zadeh
  * Girish Ramakrishnan
  * Hakim Oubouali
  * Hans Meiser
@@ -196,8 +217,11 @@
  * Jelle Besseling
  * Jocelyn Jaubert
  * Johan Fleury
+ * Jurij Podgoršek
+ * Kindred La Boneta
  * Kiro
  * Leopere
+ * Linus
  * Lukas Winkler
  * M Z
  * Manuela Silva
@@ -207,9 +231,11 @@
  * Pedro
  * Petr Balíček
  * Piotr Sikora
+ * Ryan He
  * Stefan Keks
  * Tom Wellington
  * Urtzi Odriozola
+ * Victor Hampel
  * Waazdakka
  * Winfried Hyronimus
  * Yohan Boniface
@@ -224,6 +250,7 @@
  * Ömer Faruk Çakmak
  * AQR_Rastiq
  * Al-Hassan Abdel-Raouf
+ * Alecks Gates
  * Amos Tamam
  * Andrew Morgan
  * Andy Khit
@@ -233,33 +260,43 @@
  * Arne Uplegger
  * Aurélien Béranger
  * Average Dude
+ * BGR2
  * BitTube
  * Boo Teille
+ * Branislav Pavelka
  * Dashie
  * David Luís Pereira Pires
  * David Marzal
  * EndoGai
- * Erik Guldberg
+ * Fatih Özsoy
+ * FediverseTV
  * Florent Fayolle
  * Florian
  * Frank de Lange
  * G4dter
  * Gaëtan Rizio
  * Gopherslol
+ * Goudarz Jafari
  * HHY
  * Hange
  * Hjalte
  * Hugo Peixoto
  * HybridGlucose
  * J C Worm
+ * Jan Ainali
  * Jan Marsalek
+ * José M
+ * Joël Galeran
  * Julien Lemaire
- * Jurij Podgoršek
+ * Julien Rabier
  * Lucas Teixeira
+ * Mamiako Pavel
+ * Masood Masaeli
  * Millicent Billette
  * Mondo Xíbaro
  * Moritz Warning
  * Mostafa Ahangarha
+ * Neko Nekowazarashi
  * Nicolai Larsen
  * Nojus
  * Pierre Jaury
@@ -271,9 +308,11 @@
  * Takeshi Umeda
  * Thai Localization
  * The Cashew Trader
+ * Thijs Kinkhorst
+ * Timur Seber
  * Toso Malero
  * Valvin
- * Wicklow
+ * Yaron Shahrabani
  * YiDai
  * Yogesh K S
  * ahmadsharifian
@@ -281,10 +320,14 @@
  * brucekomike
  * dingycle
  * framail
+ * h3n3
+ * imgradeone Yan
+ * kafbatur kafbatarsson
  * les
  * libertas
  * merty
  * plr20
+ * q_h
  * qwerty
  * spf
  * taziden
@@ -307,10 +350,14 @@
  * Alexander F. Rødseth
  * Ali Alim
  * Alperen Abak
+ * Alvar C.H. Freude
  * Aman Sharma
+ * Anatoly
+ * Anatoly Bogomolov
  * Andrews Góes Santos
  * Antoine Millet
  * Anton Latukha
+ * Apps
  * Armando Lüscher
  * Artem Prosvetov
  * Arthur Lutz
@@ -324,13 +371,16 @@
  * Brad Johnson
  * Cadence Ember
  * Cale
+ * Carlos García Gutiérrez
  * Charles de Lacombe
- * Chris Sakura 佐倉くりす on Youtube - 日本語は第二言語やけ、間違っとったら思いっきり叩いてくださいｗ つたない日本語ばっかりやけど頑張りまーす♪
+ * Charlie Lambda
  * Christoph Geschwind
  * Chronos
  * Claude
  * Clifford Garwood II
  * Clément Brizard
+ * DLP
+ * Daniel Dutra
  * David Dobryakov
  * DeeJayBro
  * Dimitri DI GUSTO
@@ -346,33 +396,40 @@
  * Esmail_Hazem
  * Ethan Corgatelli
  * Fabio Agreles Bezerra
+ * FediThing
  * Fernandez, ReK2
+ * Framasoft
  * Gabriel Scherer
  * Glandos
  * Grzesiek11
  * Guillaume Pérution-Kihli
  * Gérald CHATAGNON
  * Haelwenn (lanodan) Monnier
+ * Henri BAUDESSON
  * HesioZ
  * Hozan Şahin
  * ICabaleiro
+ * Ignacio Carrera González
  * Iker Garaialde
- * Ilia
  * Ismaël Bouya
  * Ivan Ip
  * Iván Cabaleiro
  * J Webb
  * Jacen
+ * Jackson Chen
  * Jacob
  * Jacques Foucry
  * Jagannath Bhat
  * Jan Prunk
  * Janey Muñoz
  * Jarosław Maciejewski
+ * Jaz Dina
  * Jeena
  * Jessica Fairchild
+ * Jeston Tan
  * Jinn Koriech
  * Jlll1
+ * Johnny Jazeix
  * Jonas Sulzer
  * Jonatan Nyberg
  * Jorge Silva
@@ -387,6 +444,7 @@
  * Kyâne Pichou
  * Leo Mouyna
  * Lesterpig
+ * Lety Does Stuff
  * Levi Bard
  * LiPeK
  * Lint
@@ -395,10 +453,13 @@
  * Lupinard
  * Léo Andrès
  * ManMade-cube42
+ * Marcel Fuhrmann
  * Marco Zehe
  * Marian Steinbach
+ * Mario Pepe
  * Markus Richter
  * Martin Trigaux
+ * Matej Šujan
  * Mateusz Piotrowski
  * Mathieu Agopian
  * Mathieu Brunot
@@ -408,8 +469,10 @@
  * Michael Williams
  * Miguel Mayol Tur
  * Mike
+ * Mikel Gartzia Santamaria
  * Milo van der Linden
  * MrGiga
+ * Murat Özalp
  * Mélanie Pin
  * Nataly Rocha
  * Nathanaël J
@@ -419,6 +482,7 @@
  * Nitesh Sawant
  * Novel Martin Harianto
  * Nuño Sempere
+ * Olivier Bouillet
  * Olivier Jolly
  * Pablo Joubert
  * Paul FLORENCE
@@ -444,10 +508,14 @@
  * Roberto Resoli
  * Robin
  * Rostyslav Haitkulov
+ * Salif Mehmed
  * Sankar
  * SansPseudoFix
+ * Sarah Lewis
  * Sebastian Paweł Wolski
+ * Seth Falco
  * Showfom
+ * Shun Sakai
  * Simon Gilliot
  * Simounet
  * Stefan Schüller
@@ -477,14 +545,16 @@
  * William Cliff
  * WingsLikeEagles
  * Yann Sionneau
- * Yaron Shahrabani
+ * Yehuda Deutsch
  * Yorwba
  * Yun
  * Zekovski
  * Zig-03
  * [ Bie ] Watcharapong Suriyawan
+ * adam iter
  * anmol26s
  * april
+ * ar9708
  * augier
  * big gamer
  * bikepunk
@@ -493,13 +563,15 @@
  * decentral1se
  * eduard pintilie
  * framabr
+ * fuomag9
  * gillux
- * imgradeone Yan
  * jameskimmel
+ * jinubook
  * jomo
  * kukhariev
  * lambdacastix
  * libertysoft3
+ * lost_geographer
  * lsde
  * ltsallas
  * luz paz
@@ -509,16 +581,18 @@
  * mahdi
  * memorybox
  * mike stedman
+ * mira.bat
  * mj-saunders
  * morteza
+ * no
  * norrist
  * nxjoseph
  * osauzet
+ * paring
  * paulienm
  * philippe lhardy
  * pitchum
  * potedeo
- * q_h
  * rdxuan
  * retiolus
  * ruvilonix

README.md

@@ -116,7 +116,7 @@ Be it as a user or an instance administrator, you can decide what your experienc
 
 <h3 align="right">Communities that help each other</h3>
 <p align="right">
-In addition to visitors using WebTorrent to share the load among them, instances can help each other by caching one another's videos. This way even small instances have a way to show content to a wider audience, as they will be shouldered by friend instances (more about that in our <a href="https://docs.joinpeertube.org/contribute/architecture#redundancy-between-instances">redundancy guide</a>).
+In addition to visitors using P2P with WebRTC to share the load among them, instances can help each other by caching one another's videos. This way even small instances have a way to show content to a wider audience, as they will be shouldered by friend instances (more about that in our <a href="https://docs.joinpeertube.org/contribute/architecture#redundancy-between-instances">redundancy guide</a>).
 </p>
 <p align="right">
 Content creators can get help from their viewers in the simplest way possible: a support button showing a message linking to their donation accounts or really anything else. No more pay-per-view and advertisements that hurt visitors and alter creativity (more about that in our <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/FAQ.md">FAQ</a>).
@@ -174,7 +174,7 @@ See the [architecture blueprint](https://docs.joinpeertube.org/contribute/archit
 
 See our REST API documentation:
   * OpenAPI 3.0.0 schema: [/support/doc/api/openapi.yaml](https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/api/openapi.yaml)
-  * Spec explorer: [docs.joinpeertube.org/api-rest-reference.html](https://docs.joinpeertube.org/api/rest-reference.html)
+  * Spec explorer: [docs.joinpeertube.org/api-rest-reference.html](https://docs.joinpeertube.org/api-rest-reference.html)
 
 See our [ActivityPub documentation](https://docs.joinpeertube.org/api/activitypub).
 
@@ -186,7 +186,7 @@ See our [ActivityPub documentation](https://docs.joinpeertube.org/api/activitypu
 
 ### Code
 
-Copyright (C) 2015-2023 PeerTube Contributors (see [CREDITS.md](/CREDITS.md))
+Copyright (C) 2015-2024 PeerTube Contributors (see [CREDITS.md](/CREDITS.md))
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published

SECURITY.md

@@ -39,9 +39,27 @@ The vulnerability is kept private until a majority of instances known on instanc
 
 ## Official Channels
 
-To help us receive vulnerability submissions we use the following official reporting channels:
-- chocobozzz@framasoft.org (GPG: [583A612D890159BE](https://keybase.io/chocobozzz/pgp_keys.asc?fingerprint=c44aad638367912ca93edd57583a612d890159be))
-- sendmemail@rigelk.eu (GPG: [EA12971B0E438F36](https://api.github.com/users/rigelk/gpg_keys))
+To help us receive vulnerability submissions we use the following official reporting channel:
+- peertube-security@framasoft.org
+
+The following PGP key can be used to encrypt your email:
+
+```
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEZjD41hYJKwYBBAHaRw8BAQdAfhTpNfIk8/doN8j+PnGzNazK6p6KXEatqz1L
+ARAmlU20M1BlZXJUdWJlIFNlY3VyaXR5IDxwZWVydHViZS1zZWN1cml0eUBmcmFt
+YXNvZnQub3JnPoiTBBMWCgA7FiEEr+3Jvd9JW64FG8cvQOaXHEo/b6cFAmYw+NYC
+GwMFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AACgkQQOaXHEo/b6fRbgD8DiAL
+7o3eeHuYnQe1I+SnSHU6RDVk/OY27+ZFSrWgsYMBAAA16aGGkbmme1mmig+iEMiL
+uhjVAfwuXb0VzrxqqmYMuDgEZjD41hIKKwYBBAGXVQEFAQEHQDCVpwHHyrS9rCQq
+0uXbPTWkWuf8yZJqpzZSoG3KY5JZAwEIB4h4BBgWCgAgFiEEr+3Jvd9JW64FG8cv
+QOaXHEo/b6cFAmYw+NYCGwwACgkQQOaXHEo/b6fwmAEAsiJDN2GG7sNA2ExjoNT8
+P0hnqJkaRh8WJ/pi3u+QlWABAJj5qRhA3Om7SYJjzYfe3fEnrS5cTW51qc96r7GU
+IdUI
+=y06w
+-----END PGP PUBLIC KEY BLOCK-----
+```
 
 If you think you have found a vulnerability, please include the following details with your report and be as descriptive as possible:
 - The location and nature of the vulnerability,

apps/peertube-cli/.npmignore

@@ -0,0 +1,4 @@
+src
+meta.json
+tsconfig.json
+scripts

apps/peertube-cli/README.md

@@ -0,0 +1,43 @@
+# PeerTube CLI
+
+## Usage
+
+See https://docs.joinpeertube.org/maintain/tools#remote-tools
+
+## Dev
+
+## Install dependencies
+
+```bash
+cd peertube-root
+yarn install --pure-lockfile
+cd apps/peertube-cli && yarn install --pure-lockfile
+```
+
+## Develop
+
+```bash
+cd peertube-root
+npm run dev:peertube-cli
+```
+
+## Build
+
+```bash
+cd peertube-root
+npm run build:peertube-cli
+```
+
+## Run
+
+```bash
+cd peertube-root
+node apps/peertube-cli/dist/peertube-cli.js --help
+```
+
+## Publish on NPM
+
+```bash
+cd peertube-root
+(cd apps/peertube-cli && npm version patch) && npm run build:peertube-cli && (cd apps/peertube-cli && npm publish --access=public)
+```

apps/peertube-cli/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "@peertube/peertube-cli",
+  "version": "1.0.2",
+  "type": "module",
+  "main": "dist/peertube.js",
+  "bin": "dist/peertube.js",
+  "engines": {
+    "node": ">=16.x"
+  },
+  "scripts": {},
+  "license": "AGPL-3.0",
+  "private": false,
+  "devDependencies": {
+    "application-config": "^3.0.0",
+    "cli-table3": "^0.6.0",
+    "netrc-parser": "^3.1.6"
+  },
+  "dependencies": {}
+}

apps/peertube-cli/scripts/build.js

@@ -0,0 +1,27 @@
+import * as esbuild from 'esbuild'
+import { readFileSync } from 'fs'
+
+const packageJSON = JSON.parse(readFileSync(new URL('../package.json', import.meta.url)))
+
+export const esbuildOptions = {
+  entryPoints: [ './src/peertube.ts' ],
+  bundle: true,
+  platform: 'node',
+  format: 'esm',
+  target: 'node16',
+  external: [
+    './lib-cov/fluent-ffmpeg',
+    'pg-hstore'
+  ],
+  outfile: './dist/peertube.js',
+  banner: {
+    js: `const require = (await import("node:module")).createRequire(import.meta.url);` +
+      `const __filename = (await import("node:url")).fileURLToPath(import.meta.url);` +
+      `const __dirname = (await import("node:path")).dirname(__filename);`
+  },
+  define: {
+    'process.env.PACKAGE_VERSION': `'${packageJSON.version}'`
+  }
+}
+
+await esbuild.build(esbuildOptions)

apps/peertube-cli/scripts/watch.js

@@ -0,0 +1,7 @@
+import * as esbuild from 'esbuild'
+import { esbuildOptions } from './build.js'
+
+const context = await esbuild.context(esbuildOptions)
+
+// Enable watch mode
+await context.watch()

apps/peertube-cli/src/peertube-auth.ts

@@ -0,0 +1,171 @@
+import CliTable3 from 'cli-table3'
+import prompt from 'prompt'
+import { Command } from '@commander-js/extra-typings'
+import { assignToken, buildServer, getNetrc, getSettings, writeSettings } from './shared/index.js'
+
+export function defineAuthProgram () {
+  const program = new Command()
+    .name('auth')
+    .description('Register your accounts on remote instances to use them with other commands')
+
+  program
+    .command('add')
+    .description('remember your accounts on remote instances for easier use')
+    .option('-u, --url <url>', 'Server url')
+    .option('-U, --username <username>', 'Username')
+    .option('-p, --password <token>', 'Password')
+    .option('--default', 'add the entry as the new default')
+    .action(options => {
+      /* eslint-disable no-import-assign */
+      prompt.override = options
+      prompt.start()
+      prompt.get({
+        properties: {
+          url: {
+            description: 'instance url',
+            conform: value => isURLaPeerTubeInstance(value),
+            message: 'It should be an URL (https://peertube.example.com)',
+            required: true
+          },
+          username: {
+            conform: value => typeof value === 'string' && value.length !== 0,
+            message: 'Name must be only letters, spaces, or dashes',
+            required: true
+          },
+          password: {
+            hidden: true,
+            replace: '*',
+            required: true
+          }
+        }
+      }, async (_, result) => {
+
+        // Check credentials
+        try {
+          // Strip out everything after the domain:port.
+          // See https://github.com/Chocobozzz/PeerTube/issues/3520
+          result.url = stripExtraneousFromPeerTubeUrl(result.url)
+
+          const server = buildServer(result.url)
+          await assignToken(server, result.username, result.password)
+        } catch (err) {
+          console.error(err.message)
+          process.exit(-1)
+        }
+
+        await setInstance(result.url, result.username, result.password, options.default)
+
+        process.exit(0)
+      })
+    })
+
+  program
+    .command('del <url>')
+    .description('Unregisters a remote instance')
+    .action(async url => {
+      await delInstance(url)
+
+      process.exit(0)
+    })
+
+  program
+    .command('list')
+    .description('List registered remote instances')
+    .action(async () => {
+      const [ settings, netrc ] = await Promise.all([ getSettings(), getNetrc() ])
+
+      const table = new CliTable3({
+        head: [ 'instance', 'login' ],
+        colWidths: [ 30, 30 ]
+      }) as any
+
+      settings.remotes.forEach(element => {
+        if (!netrc.machines[element]) return
+
+        table.push([
+          element,
+          netrc.machines[element].login
+        ])
+      })
+
+      console.log(table.toString())
+
+      process.exit(0)
+    })
+
+  program
+    .command('set-default <url>')
+    .description('Set an existing entry as default')
+    .action(async url => {
+      const settings = await getSettings()
+      const instanceExists = settings.remotes.includes(url)
+
+      if (instanceExists) {
+        settings.default = settings.remotes.indexOf(url)
+        await writeSettings(settings)
+
+        process.exit(0)
+      } else {
+        console.log('<url> is not a registered instance.')
+        process.exit(-1)
+      }
+    })
+
+  program.addHelpText('after', '\n\n  Examples:\n\n' +
+    '    $ peertube auth add -u https://peertube.cpy.re -U "PEERTUBE_USER" --password "PEERTUBE_PASSWORD"\n' +
+    '    $ peertube auth add -u https://peertube.cpy.re -U root\n' +
+    '    $ peertube auth list\n' +
+    '    $ peertube auth del https://peertube.cpy.re\n'
+  )
+
+  return program
+}
+
+// ---------------------------------------------------------------------------
+// Private
+// ---------------------------------------------------------------------------
+
+async function delInstance (url: string) {
+  const [ settings, netrc ] = await Promise.all([ getSettings(), getNetrc() ])
+
+  const index = settings.remotes.indexOf(url)
+  settings.remotes.splice(index)
+
+  if (settings.default === index) settings.default = -1
+
+  await writeSettings(settings)
+
+  delete netrc.machines[url]
+
+  await netrc.save()
+}
+
+async function setInstance (url: string, username: string, password: string, isDefault: boolean) {
+  const [ settings, netrc ] = await Promise.all([ getSettings(), getNetrc() ])
+
+  if (settings.remotes.includes(url) === false) {
+    settings.remotes.push(url)
+  }
+
+  if (isDefault || settings.remotes.length === 1) {
+    settings.default = settings.remotes.length - 1
+  }
+
+  await writeSettings(settings)
+
+  netrc.machines[url] = { login: username, password }
+  await netrc.save()
+}
+
+function isURLaPeerTubeInstance (url: string) {
+  return url.startsWith('http://') || url.startsWith('https://')
+}
+
+function stripExtraneousFromPeerTubeUrl (url: string) {
+  // Get everything before the 3rd /.
+  const urlLength = url.includes('/', 8)
+    ? url.indexOf('/', 8)
+    : url.length
+
+  return url.substring(0, urlLength)
+}

apps/peertube-cli/src/peertube-get-access-token.ts

@@ -0,0 +1,39 @@
+import { Command } from '@commander-js/extra-typings'
+import { assignToken, buildServer } from './shared/index.js'
+
+export function defineGetAccessProgram () {
+  const program = new Command()
+    .name('get-access-token')
+    .description('Get a peertube access token')
+    .alias('token')
+
+  program
+    .option('-u, --url <url>', 'Server url')
+    .option('-n, --username <username>', 'Username')
+    .option('-p, --password <token>', 'Password')
+    .action(async options => {
+      try {
+        if (
+          !options.url ||
+          !options.username ||
+          !options.password
+        ) {
+          if (!options.url) console.error('--url field is required.')
+          if (!options.username) console.error('--username field is required.')
+          if (!options.password) console.error('--password field is required.')
+
+          process.exit(-1)
+        }
+
+        const server = buildServer(options.url)
+        await assignToken(server, options.username, options.password)
+
+        console.log(server.accessToken)
+      } catch (err) {
+        console.error('Cannot get access token: ' + err.message)
+        process.exit(-1)
+      }
+    })
+
+  return program
+}

apps/peertube-cli/src/peertube-plugins.ts

@@ -0,0 +1,167 @@
+import CliTable3 from 'cli-table3'
+import { isAbsolute } from 'path'
+import { Command } from '@commander-js/extra-typings'
+import { PluginType, PluginType_Type } from '@peertube/peertube-models'
+import { assignToken, buildServer, CommonProgramOptions, getServerCredentials } from './shared/index.js'
+
+export function definePluginsProgram () {
+  const program = new Command()
+
+  program
+    .name('plugins')
+    .description('Manage instance plugins/themes')
+    .alias('p')
+
+  program
+    .command('list')
+    .description('List installed plugins')
+    .option('-u, --url <url>', 'Server url')
+    .option('-U, --username <username>', 'Username')
+    .option('-p, --password <token>', 'Password')
+    .option('-t, --only-themes', 'List themes only')
+    .option('-P, --only-plugins', 'List plugins only')
+    .action(async options => {
+      try {
+        await pluginsListCLI(options)
+      } catch (err) {
+        console.error('Cannot list plugins: ' + err.message)
+        process.exit(-1)
+      }
+    })
+
+  program
+    .command('install')
+    .description('Install a plugin or a theme')
+    .option('-u, --url <url>', 'Server url')
+    .option('-U, --username <username>', 'Username')
+    .option('-p, --password <token>', 'Password')
+    .option('-P --path <path>', 'Install from a path')
+    .option('-n, --npm-name <npmName>', 'Install from npm')
+    .option('--plugin-version <pluginVersion>', 'Specify the plugin version to install (only available when installing from npm)')
+    .action(async options => {
+      try {
+        await installPluginCLI(options)
+      } catch (err) {
+        console.error('Cannot install plugin: ' + err.message)
+        process.exit(-1)
+      }
+    })
+
+  program
+    .command('update')
+    .description('Update a plugin or a theme')
+    .option('-u, --url <url>', 'Server url')
+    .option('-U, --username <username>', 'Username')
+    .option('-p, --password <token>', 'Password')
+    .option('-P --path <path>', 'Update from a path')
+    .option('-n, --npm-name <npmName>', 'Update from npm')
+    .action(async options => {
+      try {
+        await updatePluginCLI(options)
+      } catch (err) {
+        console.error('Cannot update plugin: ' + err.message)
+        process.exit(-1)
+      }
+    })
+
+  program
+    .command('uninstall')
+    .description('Uninstall a plugin or a theme')
+    .option('-u, --url <url>', 'Server url')
+    .option('-U, --username <username>', 'Username')
+    .option('-p, --password <token>', 'Password')
+    .option('-n, --npm-name <npmName>', 'NPM plugin/theme name')
+    .action(async options => {
+      try {
+        await uninstallPluginCLI(options)
+      } catch (err) {
+        console.error('Cannot uninstall plugin: ' + err.message)
+        process.exit(-1)
+      }
+    })
+
+  return program
+}
+
+// ----------------------------------------------------------------------------
+
+async function pluginsListCLI (options: CommonProgramOptions & { onlyThemes?: true, onlyPlugins?: true }) {
+  const { url, username, password } = await getServerCredentials(options)
+  const server = buildServer(url)
+  await assignToken(server, username, password)
+
+  let pluginType: PluginType_Type
+  if (options.onlyThemes) pluginType = PluginType.THEME
+  if (options.onlyPlugins) pluginType = PluginType.PLUGIN
+
+  const { data } = await server.plugins.list({ start: 0, count: 100, sort: 'name', pluginType })
+
+  const table = new CliTable3({
+    head: [ 'name', 'version', 'homepage' ],
+    colWidths: [ 50, 20, 50 ]
+  }) as any
+
+  for (const plugin of data) {
+    const npmName = plugin.type === PluginType.PLUGIN
+      ? 'peertube-plugin-' + plugin.name
+      : 'peertube-theme-' + plugin.name
+
+    table.push([
+      npmName,
+      plugin.version,
+      plugin.homepage
+    ])
+  }
+
+  console.log(table.toString())
+}
+
+async function installPluginCLI (options: CommonProgramOptions & { path?: string, npmName?: string, pluginVersion?: string }) {
+  if (!options.path && !options.npmName) {
+    throw new Error('You need to specify the npm name or the path of the plugin you want to install.')
+  }
+
+  if (options.path && !isAbsolute(options.path)) {
+    throw new Error('Path should be absolute.')
+  }
+
+  const { url, username, password } = await getServerCredentials(options)
+  const server = buildServer(url)
+  await assignToken(server, username, password)
+
+  await server.plugins.install({ npmName: options.npmName, path: options.path, pluginVersion: options.pluginVersion })
+
+  console.log('Plugin installed.')
+}
+
+async function updatePluginCLI (options: CommonProgramOptions & { path?: string, npmName?: string }) {
+  if (!options.path && !options.npmName) {
+    throw new Error('You need to specify the npm name or the path of the plugin you want to update.')
+  }
+
+  if (options.path && !isAbsolute(options.path)) {
+    throw new Error('Path should be absolute.')
+  }
+
+  const { url, username, password } = await getServerCredentials(options)
+  const server = buildServer(url)
+  await assignToken(server, username, password)
+
+  await server.plugins.update({ npmName: options.npmName, path: options.path })
+
+  console.log('Plugin updated.')
+}
+
+async function uninstallPluginCLI (options: CommonProgramOptions & { npmName?: string }) {
+  if (!options.npmName) {
+    throw new Error('You need to specify the npm name of the plugin/theme you want to uninstall.')
+  }
+
+  const { url, username, password } = await getServerCredentials(options)
+  const server = buildServer(url)
+  await assignToken(server, username, password)
+
+  await server.plugins.uninstall({ npmName: options.npmName })
+
+  console.log('Plugin uninstalled.')
+}

apps/peertube-cli/src/peertube-redundancy.ts

@@ -0,0 +1,186 @@
+import bytes from 'bytes'
+import CliTable3 from 'cli-table3'
+import { URL } from 'url'
+import { Command } from '@commander-js/extra-typings'
+import { forceNumber, uniqify } from '@peertube/peertube-core-utils'
+import { HttpStatusCode, VideoRedundanciesTarget } from '@peertube/peertube-models'
+import { assignToken, buildServer, CommonProgramOptions, getServerCredentials } from './shared/index.js'
+
+export function defineRedundancyProgram () {
+  const program = new Command()
+    .name('redundancy')
+    .description('Manage instance redundancies')
+    .alias('r')
+
+  program
+    .command('list-remote-redundancies')
+    .description('List remote redundancies on your videos')
+    .option('-u, --url <url>', 'Server url')
+    .option('-U, --username <username>', 'Username')
+    .option('-p, --password <token>', 'Password')
+    .action(async options => {
+      try {
+        await listRedundanciesCLI({ target: 'my-videos', ...options })
+      } catch (err) {
+        console.error('Cannot list remote redundancies: ' + err.message)
+        process.exit(-1)
+      }
+    })
+
+  program
+    .command('list-my-redundancies')
+    .description('List your redundancies of remote videos')
+    .option('-u, --url <url>', 'Server url')
+    .option('-U, --username <username>', 'Username')
+    .option('-p, --password <token>', 'Password')
+    .action(async options => {
+      try {
+        await listRedundanciesCLI({ target: 'remote-videos', ...options })
+      } catch (err) {
+        console.error('Cannot list redundancies: ' + err.message)
+        process.exit(-1)
+      }
+    })
+
+  program
+    .command('add')
+    .description('Duplicate a video in your redundancy system')
+    .option('-u, --url <url>', 'Server url')
+    .option('-U, --username <username>', 'Username')
+    .option('-p, --password <token>', 'Password')
+    .requiredOption('-v, --video <videoId>', 'Video id to duplicate', parseInt)
+    .action(async options => {
+      try {
+        await addRedundancyCLI(options)
+      } catch (err) {
+        console.error('Cannot duplicate video: ' + err.message)
+        process.exit(-1)
+      }
+    })
+
+  program
+    .command('remove')
+    .description('Remove a video from your redundancies')
+    .option('-u, --url <url>', 'Server url')
+    .option('-U, --username <username>', 'Username')
+    .option('-p, --password <token>', 'Password')
+    .requiredOption('-v, --video <videoId>', 'Video id to remove from redundancies', parseInt)
+    .action(async options => {
+      try {
+        await removeRedundancyCLI(options)
+      } catch (err) {
+        console.error('Cannot remove redundancy: ' + err)
+        process.exit(-1)
+      }
+    })
+
+  return program
+}
+
+// ----------------------------------------------------------------------------
+
+async function listRedundanciesCLI (options: CommonProgramOptions & { target: VideoRedundanciesTarget }) {
+  const { target } = options
+
+  const { url, username, password } = await getServerCredentials(options)
+  const server = buildServer(url)
+  await assignToken(server, username, password)
+
+  const { data } = await server.redundancy.listVideos({ start: 0, count: 100, sort: 'name', target })
+
+  const table = new CliTable3({
+    head: [ 'video id', 'video name', 'video url', 'files', 'playlists', 'by instances', 'total size' ]
+  }) as any
+
+  for (const redundancy of data) {
+    const webVideoFiles = redundancy.redundancies.files
+    const streamingPlaylists = redundancy.redundancies.streamingPlaylists
+
+    let totalSize = ''
+    if (target === 'remote-videos') {
+      const tmp = webVideoFiles.concat(streamingPlaylists)
+        .reduce((a, b) => a + b.size, 0)
+
+      // FIXME: don't use external dependency to stringify bytes: we already have the functions in the client
+      totalSize = bytes(tmp)
+    }
+
+    const instances = uniqify(
+      webVideoFiles.concat(streamingPlaylists)
+        .map(r => r.fileUrl)
+        .map(u => new URL(u).host)
+    )
+
+    table.push([
+      redundancy.id.toString(),
+      redundancy.name,
+      redundancy.url,
+      webVideoFiles.length,
+      streamingPlaylists.length,
+      instances.join('\n'),
+      totalSize
+    ])
+  }
+
+  console.log(table.toString())
+}
+
+async function addRedundancyCLI (options: { video: number } & CommonProgramOptions) {
+  const { url, username, password } = await getServerCredentials(options)
+  const server = buildServer(url)
+  await assignToken(server, username, password)
+
+  if (!options.video || isNaN(options.video)) {
+    throw new Error('You need to specify the video id to duplicate and it should be a number.')
+  }
+
+  try {
+    await server.redundancy.addVideo({ videoId: options.video })
+
+    console.log('Video will be duplicated by your instance!')
+  } catch (err) {
+    if (err.message.includes(HttpStatusCode.CONFLICT_409)) {
+      throw new Error('This video is already duplicated by your instance.')
+    }
+
+    if (err.message.includes(HttpStatusCode.NOT_FOUND_404)) {
+      throw new Error('This video id does not exist.')
+    }
+
+    throw err
+  }
+}
+
+async function removeRedundancyCLI (options: CommonProgramOptions & { video: number }) {
+  const { url, username, password } = await getServerCredentials(options)
+  const server = buildServer(url)
+  await assignToken(server, username, password)
+
+  if (!options.video || isNaN(options.video)) {
+    throw new Error('You need to specify the video id to remove from your redundancies')
+  }
+
+  const videoId = forceNumber(options.video)
+
+  const myVideoRedundancies = await server.redundancy.listVideos({ target: 'my-videos' })
+  let videoRedundancy = myVideoRedundancies.data.find(r => videoId === r.id)
+
+  if (!videoRedundancy) {
+    const remoteVideoRedundancies = await server.redundancy.listVideos({ target: 'remote-videos' })
+    videoRedundancy = remoteVideoRedundancies.data.find(r => videoId === r.id)
+  }
+
+  if (!videoRedundancy) {
+    throw new Error('Video redundancy not found.')
+  }
+
+  const ids = videoRedundancy.redundancies.files
+    .concat(videoRedundancy.redundancies.streamingPlaylists)
+    .map(r => r.id)
+
+  for (const id of ids) {
+    await server.redundancy.removeVideo({ redundancyId: id })
+  }
+
+  console.log('Video redundancy removed!')
+}

apps/peertube-cli/src/peertube-upload.ts

@@ -0,0 +1,167 @@
+import { access, constants } from 'fs/promises'
+import { isAbsolute } from 'path'
+import { inspect } from 'util'
+import { Command } from '@commander-js/extra-typings'
+import { VideoPrivacy } from '@peertube/peertube-models'
+import { PeerTubeServer } from '@peertube/peertube-server-commands'
+import { assignToken, buildServer, getServerCredentials, listOptions } from './shared/index.js'
+
+type UploadOptions = {
+  url?: string
+  username?: string
+  password?: string
+  thumbnail?: string
+  preview?: string
+  file?: string
+  videoName?: string
+  category?: string
+  licence?: string
+  language?: string
+  tags?: string
+  nsfw?: true
+  videoDescription?: string
+  privacy?: number
+  channelName?: string
+  noCommentsEnabled?: true
+  support?: string
+  noWaitTranscoding?: true
+  noDownloadEnabled?: true
+}
+
+export function defineUploadProgram () {
+  const program = new Command('upload')
+    .description('Upload a video on a PeerTube instance')
+    .alias('up')
+
+  program
+    .option('-u, --url <url>', 'Server url')
+    .option('-U, --username <username>', 'Username')
+    .option('-p, --password <token>', 'Password')
+    .option('-b, --thumbnail <thumbnailPath>', 'Thumbnail path')
+    .option('--preview <previewPath>', 'Preview path')
+    .option('-f, --file <file>', 'Video absolute file path')
+    .option('-n, --video-name <name>', 'Video name')
+    .option('-c, --category <category_number>', 'Category number')
+    .option('-l, --licence <licence_number>', 'Licence number')
+    .option('-L, --language <language_code>', 'Language ISO 639 code (fr or en...)')
+    .option('-t, --tags <tags>', 'Video tags', listOptions)
+    .option('-N, --nsfw', 'Video is Not Safe For Work')
+    .option('-d, --video-description <description>', 'Video description')
+    .option('-P, --privacy <privacy_number>', 'Privacy', parseInt)
+    .option('-C, --channel-name <channel_name>', 'Channel name')
+    .option('--no-comments-enabled', 'Disable video comments')
+    .option('-s, --support <support>', 'Video support text')
+    .option('--no-wait-transcoding', 'Do not wait transcoding before publishing the video')
+    .option('--no-download-enabled', 'Disable video download')
+    .option('-v, --verbose <verbose>', 'Verbosity, from 0/\'error\' to 4/\'debug\'', 'info')
+    .action(async options => {
+      try {
+        const { url, username, password } = await getServerCredentials(options)
+
+        if (!options.videoName || !options.file) {
+          if (!options.videoName) console.error('--video-name is required.')
+          if (!options.file) console.error('--file is required.')
+
+          process.exit(-1)
+        }
+
+        if (isAbsolute(options.file) === false) {
+          console.error('File path should be absolute.')
+          process.exit(-1)
+        }
+
+        await run({ ...options, url, username, password })
+      } catch (err) {
+        console.error('Cannot upload video: ' + err.message)
+        process.exit(-1)
+      }
+    })
+
+  return program
+}
+
+// ---------------------------------------------------------------------------
+// Private
+// ---------------------------------------------------------------------------
+
+async function run (options: UploadOptions) {
+  const { url, username, password } = options
+
+  const server = buildServer(url)
+  await assignToken(server, username, password)
+
+  await access(options.file, constants.F_OK)
+
+  console.log('Uploading %s video...', options.videoName)
+
+  const baseAttributes = await buildVideoAttributesFromCommander(server, options)
+
+  const attributes = {
+    ...baseAttributes,
+
+    fixture: options.file,
+    thumbnailfile: options.thumbnail,
+    previewfile: options.preview
+  }
+
+  try {
+    await server.videos.upload({ attributes })
+    console.log(`Video ${options.videoName} uploaded.`)
+    process.exit(0)
+  } catch (err) {
+    const message = err.message || ''
+    if (message.includes('413')) {
+      console.error('Aborted: user quota is exceeded or video file is too big for this PeerTube instance.')
+    } else {
+      console.error(inspect(err))
+    }
+
+    process.exit(-1)
+  }
+}
+
+async function buildVideoAttributesFromCommander (server: PeerTubeServer, options: UploadOptions, defaultAttributes: any = {}) {
+  const defaultBooleanAttributes = {
+    nsfw: false,
+    commentsEnabled: true,
+    downloadEnabled: true,
+    waitTranscoding: true
+  }
+
+  const booleanAttributes: { [id in keyof typeof defaultBooleanAttributes]: boolean } | {} = {}
+
+  for (const key of Object.keys(defaultBooleanAttributes)) {
+    if (options[key] !== undefined) {
+      booleanAttributes[key] = options[key]
+    } else if (defaultAttributes[key] !== undefined) {
+      booleanAttributes[key] = defaultAttributes[key]
+    } else {
+      booleanAttributes[key] = defaultBooleanAttributes[key]
+    }
+  }
+
+  const videoAttributes = {
+    name: options.videoName || defaultAttributes.name,
+    category: options.category || defaultAttributes.category || undefined,
+    licence: options.licence || defaultAttributes.licence || undefined,
+    language: options.language || defaultAttributes.language || undefined,
+    privacy: options.privacy || defaultAttributes.privacy || VideoPrivacy.PUBLIC,
+    support: options.support || defaultAttributes.support || undefined,
+    description: options.videoDescription || defaultAttributes.description || undefined,
+    tags: options.tags || defaultAttributes.tags || undefined
+  }
+
+  Object.assign(videoAttributes, booleanAttributes)
+
+  if (options.channelName) {
+    const videoChannel = await server.channels.get({ channelName: options.channelName })
+
+    Object.assign(videoAttributes, { channelId: videoChannel.id })
+
+    if (!videoAttributes.support && videoChannel.support) {
+      Object.assign(videoAttributes, { support: videoChannel.support })
+    }
+  }
+
+  return videoAttributes
+}

apps/peertube-cli/src/peertube.ts

@@ -0,0 +1,64 @@
+#!/usr/bin/env node
+
+import { Command } from '@commander-js/extra-typings'
+import { defineAuthProgram } from './peertube-auth.js'
+import { defineGetAccessProgram } from './peertube-get-access-token.js'
+import { definePluginsProgram } from './peertube-plugins.js'
+import { defineRedundancyProgram } from './peertube-redundancy.js'
+import { defineUploadProgram } from './peertube-upload.js'
+import { getSettings, version } from './shared/index.js'
+
+const program = new Command()
+
+program
+  .version(version, '-v, --version')
+  .usage('[command] [options]')
+
+program.addCommand(defineAuthProgram())
+program.addCommand(defineUploadProgram())
+program.addCommand(defineRedundancyProgram())
+program.addCommand(definePluginsProgram())
+program.addCommand(defineGetAccessProgram())
+
+// help on no command
+if (!process.argv.slice(2).length) {
+  const logo = '░P░e░e░r░T░u░b░e░'
+  console.log(`
+  ___/),.._                           ` + logo + `
+/'   ,.   ."'._
+(     "'   '-.__"-._             ,-
+\\'='='),  "\\ -._-"-.          -"/
+      / ""/"\\,_\\,__""       _" /,-
+     /   /                -" _/"/
+    /   |    ._\\\\ |\\  |_.".-"  /
+   /    |   __\\)|)|),/|_." _,."
+  /     \\_."   " ") | ).-""---''--
+ (                  "/.""7__-""''
+ |                   " ."._--._
+ \\       \\ (_    __   ""   ".,_
+  \\.,.    \\  ""   -"".-"
+   ".,_,  (",_-,,,-".-
+       "'-,\\_   __,-"
+             ",)" ")
+              /"\\-"
+            ,"\\/
+      _,.__/"\\/_                     (the CLI for red chocobos)
+     / \\) "./,  ".
+  --/---"---" "-) )---- by Chocobozzz et al.\n`)
+}
+
+getSettings()
+  .then(settings => {
+    const state = (settings.default === undefined || settings.default === -1)
+      ? 'no instance selected, commands will require explicit arguments'
+      : 'instance ' + settings.remotes[settings.default] + ' selected'
+
+    program
+      .addHelpText('after', '\n\n  State: ' + state + '\n\n' +
+        '  Examples:\n\n' +
+        '    $ peertube auth add -u "PEERTUBE_URL" -U "PEERTUBE_USER" --password "PEERTUBE_PASSWORD"\n' +
+        '    $ peertube up <videoFile>\n'
+      )
+      .parse(process.argv)
+  })
+  .catch(err => console.error(err))

apps/peertube-cli/src/shared/cli.ts

@@ -0,0 +1,195 @@
+import applicationConfig from 'application-config'
+import { Netrc } from 'netrc-parser'
+import { join } from 'path'
+import { createLogger, format, transports } from 'winston'
+import { UserRole } from '@peertube/peertube-models'
+import { getAppNumber, isTestInstance, root } from '@peertube/peertube-node-utils'
+import { PeerTubeServer } from '@peertube/peertube-server-commands'
+
+export type CommonProgramOptions = {
+  url?: string
+  username?: string
+  password?: string
+}
+
+let configName = 'PeerTube/CLI'
+if (isTestInstance()) configName += `-${getAppNumber()}`
+
+const config = applicationConfig(configName)
+
+const version: string = process.env.PACKAGE_VERSION
+
+async function getAdminTokenOrDie (server: PeerTubeServer, username: string, password: string) {
+  const token = await server.login.getAccessToken(username, password)
+  const me = await server.users.getMyInfo({ token })
+
+  if (me.role.id !== UserRole.ADMINISTRATOR) {
+    console.error('You must be an administrator.')
+    process.exit(-1)
+  }
+
+  return token
+}
+
+interface Settings {
+  remotes: any[]
+  default: number
+}
+
+async function getSettings () {
+  const defaultSettings: Settings = {
+    remotes: [],
+    default: -1
+  }
+
+  const data = await config.read() as Promise<Settings>
+
+  return Object.keys(data).length === 0
+    ? defaultSettings
+    : data
+}
+
+async function getNetrc () {
+  const netrc = isTestInstance()
+    ? new Netrc(join(root(import.meta.url), 'test' + getAppNumber(), 'netrc'))
+    : new Netrc()
+
+  await netrc.load()
+
+  return netrc
+}
+
+function writeSettings (settings: Settings) {
+  return config.write(settings)
+}
+
+function deleteSettings () {
+  return config.trash()
+}
+
+function getRemoteObjectOrDie (
+  options: CommonProgramOptions,
+  settings: Settings,
+  netrc: Netrc
+): { url: string, username: string, password: string } {
+
+  function exitIfNoOptions (optionNames: string[], errorPrefix: string = '') {
+    let exit = false
+
+    for (const key of optionNames) {
+      if (!options[key]) {
+        if (exit === false && errorPrefix) console.error(errorPrefix)
+
+        console.error(`--${key} field is required`)
+        exit = true
+      }
+    }
+
+    if (exit) process.exit(-1)
+  }
+
+  // If username or password are specified, both are mandatory
+  if (options.username || options.password) {
+    exitIfNoOptions([ 'username', 'password' ])
+  }
+
+  // If no available machines, url, username and password args are mandatory
+  if (Object.keys(netrc.machines).length === 0) {
+    exitIfNoOptions([ 'url', 'username', 'password' ], 'No account found in netrc')
+  }
+
+  if (settings.remotes.length === 0 || settings.default === -1) {
+    exitIfNoOptions([ 'url' ], 'No default instance found')
+  }
+
+  let url: string = options.url
+  let username: string = options.username
+  let password: string = options.password
+
+  if (!url && settings.default !== -1) url = settings.remotes[settings.default]
+
+  const machine = netrc.machines[url]
+  if ((!username || !password) && !machine) {
+    console.error('Cannot find existing configuration for %s.', url)
+    process.exit(-1)
+  }
+
+  if (!username && machine) username = machine.login
+  if (!password && machine) password = machine.password
+
+  return { url, username, password }
+}
+
+function listOptions (val: any) {
+  return val.split(',')
+}
+
+function getServerCredentials (options: CommonProgramOptions) {
+  return Promise.all([ getSettings(), getNetrc() ])
+                .then(([ settings, netrc ]) => {
+                  return getRemoteObjectOrDie(options, settings, netrc)
+                })
+}
+
+function buildServer (url: string) {
+  return new PeerTubeServer({ url })
+}
+
+async function assignToken (server: PeerTubeServer, username: string, password: string) {
+  const bodyClient = await server.login.getClient()
+  const client = { id: bodyClient.client_id, secret: bodyClient.client_secret }
+
+  const body = await server.login.login({ client, user: { username, password } })
+
+  server.accessToken = body.access_token
+}
+
+function getLogger (logLevel = 'info') {
+  const logLevels = {
+    0: 0,
+    error: 0,
+    1: 1,
+    warn: 1,
+    2: 2,
+    info: 2,
+    3: 3,
+    verbose: 3,
+    4: 4,
+    debug: 4
+  }
+
+  const logger = createLogger({
+    levels: logLevels,
+    format: format.combine(
+      format.splat(),
+      format.simple()
+    ),
+    transports: [
+      new (transports.Console)({
+        level: logLevel
+      })
+    ]
+  })
+
+  return logger
+}
+
+// ---------------------------------------------------------------------------
+
+export {
+  version,
+  getLogger,
+  getSettings,
+  getNetrc,
+  getRemoteObjectOrDie,
+  writeSettings,
+  deleteSettings,
+
+  getServerCredentials,
+
+  listOptions,
+
+  getAdminTokenOrDie,
+  buildServer,
+  assignToken
+}

apps/peertube-cli/src/shared/index.ts

@@ -0,0 +1 @@
+export * from './cli.js'

apps/peertube-cli/tsconfig.json

@@ -0,0 +1,15 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist",
+    "rootDir": "src",
+    "tsBuildInfoFile": "./dist/.tsbuildinfo"
+  },
+  "references": [
+    { "path": "../../packages/core-utils" },
+    { "path": "../../packages/models" },
+    { "path": "../../packages/node-utils" },
+    { "path": "../../packages/server-commands" }
+  ]
+}

apps/peertube-cli/yarn.lock

@@ -0,0 +1,236 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@colors/colors@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
+  integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
+
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+application-config-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/application-config-path/-/application-config-path-1.0.0.tgz#9c25b8c00ac9a342db27275abd3f38c67bbe5a05"
+  integrity sha512-6ZDlLTlfqrTybVzZJDpX2K2ZufqyMyiTbOG06GpxmkmczFgTN+YYRGcTcMCXv/F5P5SrZijVjzzpPUE9BvheLg==
+
+application-config@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/application-config/-/application-config-3.0.0.tgz#9adec84dd2d81e97dd78ea0dffcbf97381a1f55c"
+  integrity sha512-7ViR4soQJDx2O9iLf1vGxvekkPqvwqV/AZ2OL3DNcAQrg03UjJE1VeBk7oYNoN9AKB0eNyVrcM7kPD30NKeLLw==
+  dependencies:
+    application-config-path "^1.0.0"
+    load-json-file "^7.0.1"
+    write-json-file "^5.0.0"
+
+cli-table3@^0.6.0:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2"
+  integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==
+  dependencies:
+    string-width "^4.2.0"
+  optionalDependencies:
+    "@colors/colors" "1.5.0"
+
+cross-spawn@^6.0.0:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+debug@^3.1.0:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+  dependencies:
+    ms "^2.1.1"
+
+detect-indent@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-7.0.1.tgz#cbb060a12842b9c4d333f1cac4aa4da1bb66bc25"
+  integrity sha512-Mc7QhQ8s+cLrnUfU/Ji94vG/r8M26m8f++vyres4ZoojaRDpZ1eSIh/EpzLNwlWuvzSZ3UbDFspjFvTDXe6e/g==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+execa@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
+  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+get-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  integrity sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-plain-obj@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.1.0.tgz#d65025edec3657ce032fd7db63c97883eaed71f0"
+  integrity sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==
+
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==
+
+is-typedarray@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
+
+load-json-file@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-7.0.1.tgz#a3c9fde6beffb6bedb5acf104fad6bb1604e1b00"
+  integrity sha512-Gnxj3ev3mB5TkVBGad0JM6dmLiQL+o0t23JPBZ9sd+yvSLk05mFoqKBw5N8gbbkU4TNXyqCgIrl/VM17OgUIgQ==
+
+ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
+netrc-parser@^3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/netrc-parser/-/netrc-parser-3.1.6.tgz#7243c9ec850b8e805b9bdc7eae7b1450d4a96e72"
+  integrity sha512-lY+fmkqSwntAAjfP63jB4z5p5WbuZwyMCD3pInT7dpHU/Gc6Vv90SAC6A0aNiqaRGHiuZFBtiwu+pu8W/Eyotw==
+  dependencies:
+    debug "^3.1.0"
+    execa "^0.10.0"
+
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==
+  dependencies:
+    path-key "^2.0.0"
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
+
+path-key@^2.0.0, path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
+
+semver@^5.5.0:
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
+
+signal-exit@^3.0.0, signal-exit@^3.0.2:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
+
+sort-keys@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-5.0.0.tgz#5d775f8ae93ecc29bc7312bbf3acac4e36e3c446"
+  integrity sha512-Pdz01AvCAottHTPQGzndktFNdbRA75BgOfeT1hH+AMnJFv8lynkPi42rfeEhpx1saTEI3YNMWxfqu0sFD1G8pw==
+  dependencies:
+    is-plain-obj "^4.0.0"
+
+string-width@^4.2.0:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==
+
+typedarray-to-buffer@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
+  dependencies:
+    is-typedarray "^1.0.0"
+
+which@^1.2.9:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+write-file-atomic@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
+  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
+  dependencies:
+    imurmurhash "^0.1.4"
+    is-typedarray "^1.0.0"
+    signal-exit "^3.0.2"
+    typedarray-to-buffer "^3.1.5"
+
+write-json-file@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-5.0.0.tgz#11c329a8ea9e8e23fb92a87cc27412a15f87708b"
+  integrity sha512-ddSsCLa4aQ3kI21BthINo4q905/wfhvQ3JL3774AcRjBaiQmfn5v4rw77jQ7T6CmAit9VOQO+FsLyPkwxoB1fw==
+  dependencies:
+    detect-indent "^7.0.0"
+    is-plain-obj "^4.0.0"
+    sort-keys "^5.0.0"
+    write-file-atomic "^3.0.3"

apps/peertube-runner/.gitignore

@@ -0,0 +1,3 @@
+node_modules
+dist
+meta.json

apps/peertube-runner/.npmignore

@@ -0,0 +1,4 @@
+src
+meta.json
+tsconfig.json
+scripts

apps/peertube-runner/README.md

@@ -0,0 +1,43 @@
+# PeerTube runner
+
+Runner program to execute jobs (transcoding...) of remote PeerTube instances.
+
+Commands below has to be run at the root of PeerTube git repository.
+
+## Dev
+
+### Install dependencies
+
+```bash
+cd peertube-root
+yarn install --pure-lockfile
+cd apps/peertube-runner && yarn install --pure-lockfile
+```
+
+### Develop
+
+```bash
+cd peertube-root
+npm run dev:peertube-runner
+```
+
+### Build
+
+```bash
+cd peertube-root
+npm run build:peertube-runner
+```
+
+### Run
+
+```bash
+cd peertube-root
+node apps/peertube-runner/dist/peertube-runner.js --help
+```
+
+### Publish on NPM
+
+```bash
+cd peertube-root
+(cd apps/peertube-runner && npm version patch) && npm run build:peertube-runner && (cd apps/peertube-runner && npm publish --access=public)
+```

apps/peertube-runner/package.json

@@ -0,0 +1,21 @@
+{
+  "name": "@peertube/peertube-runner",
+  "version": "0.0.16",
+  "type": "module",
+  "main": "dist/peertube-runner.js",
+  "bin": "dist/peertube-runner.js",
+  "engines": {
+    "node": ">=16.x"
+  },
+  "license": "AGPL-3.0",
+  "dependencies": {},
+  "devDependencies": {
+    "@iarna/toml": "^2.2.5",
+    "@peertube/net-ipc": "^2.2.0",
+    "@types/follow-redirects": "1.14.4",
+    "env-paths": "^3.0.0",
+    "follow-redirects": "^1.15.5",
+    "pino": "^8.11.0",
+    "pino-pretty": "^10.0.0"
+  }
+}

apps/peertube-runner/scripts/build.js

@@ -0,0 +1,27 @@
+import * as esbuild from 'esbuild'
+import { readFileSync } from 'fs'
+
+const packageJSON = JSON.parse(readFileSync(new URL('../package.json', import.meta.url)))
+
+export const esbuildOptions = {
+  entryPoints: [ './src/peertube-runner.ts' ],
+  bundle: true,
+  platform: 'node',
+  format: 'esm',
+  target: 'node16',
+  external: [
+    './lib-cov/fluent-ffmpeg',
+    'pg-hstore'
+  ],
+  outfile: './dist/peertube-runner.js',
+  banner: {
+    js: `const require = (await import("node:module")).createRequire(import.meta.url);` +
+      `const __filename = (await import("node:url")).fileURLToPath(import.meta.url);` +
+      `const __dirname = (await import("node:path")).dirname(__filename);`
+  },
+  define: {
+    'process.env.PACKAGE_VERSION': `'${packageJSON.version}'`
+  }
+}
+
+await esbuild.build(esbuildOptions)

apps/peertube-runner/scripts/watch.js

@@ -0,0 +1,7 @@
+import * as esbuild from 'esbuild'
+import { esbuildOptions } from './build.js'
+
+const context = await esbuild.context(esbuildOptions)
+
+// Enable watch mode
+await context.watch()

apps/peertube-runner/src/peertube-runner.ts

@@ -0,0 +1,91 @@
+#!/usr/bin/env node
+
+import { Command, InvalidArgumentError } from '@commander-js/extra-typings'
+import { listRegistered, registerRunner, unregisterRunner } from './register/index.js'
+import { RunnerServer } from './server/index.js'
+import { ConfigManager, logger } from './shared/index.js'
+
+const program = new Command()
+  .version(process.env.PACKAGE_VERSION)
+  .option(
+    '--id <id>',
+    'Runner server id, so you can run multiple PeerTube server runners with different configurations on the same machine',
+    'default'
+  )
+  .option('--verbose', 'Run in verbose mode')
+  .hook('preAction', thisCommand => {
+    const options = thisCommand.opts()
+
+    ConfigManager.Instance.init(options.id)
+
+    if (options.verbose === true) {
+      logger.level = 'debug'
+    }
+  })
+
+program.command('server')
+  .description('Run in server mode, to execute remote jobs of registered PeerTube instances')
+  .action(async () => {
+    try {
+      await RunnerServer.Instance.run()
+    } catch (err) {
+      logger.error(err, 'Cannot run PeerTube runner as server mode')
+      process.exit(-1)
+    }
+  })
+
+program.command('register')
+  .description('Register a new PeerTube instance to process runner jobs')
+  .requiredOption('--url <url>', 'PeerTube instance URL', parseUrl)
+  .requiredOption('--registration-token <token>', 'Runner registration token (can be found in PeerTube instance administration')
+  .requiredOption('--runner-name <name>', 'Runner name')
+  .option('--runner-description <description>', 'Runner description')
+  .action(async options => {
+    try {
+      await registerRunner(options)
+    } catch (err) {
+      console.error('Cannot register this PeerTube runner.')
+      console.error(err)
+      process.exit(-1)
+    }
+  })
+
+program.command('unregister')
+  .description('Unregister the runner from PeerTube instance')
+  .requiredOption('--url <url>', 'PeerTube instance URL', parseUrl)
+  .requiredOption('--runner-name <name>', 'Runner name')
+  .action(async options => {
+    try {
+      await unregisterRunner(options)
+    } catch (err) {
+      console.error('Cannot unregister this PeerTube runner.')
+      console.error(err)
+      process.exit(-1)
+    }
+  })
+
+program.command('list-registered')
+  .description('List registered PeerTube instances')
+  .action(async () => {
+    try {
+      await listRegistered()
+    } catch (err) {
+      console.error('Cannot list registered PeerTube instances.')
+      console.error(err)
+      process.exit(-1)
+    }
+  })
+
+program.parse()
+
+// ---------------------------------------------------------------------------
+// Private
+// ---------------------------------------------------------------------------
+
+function parseUrl (url: string) {
+  if (url.startsWith('http://') !== true && url.startsWith('https://') !== true) {
+    throw new InvalidArgumentError('URL should start with a http:// or https://')
+  }
+
+  return url
+}

apps/peertube-runner/src/register/index.ts

@@ -0,0 +1 @@
+export * from './register.js'

apps/peertube-runner/src/register/register.ts

@@ -0,0 +1,36 @@
+import { IPCClient } from '../shared/ipc/index.js'
+
+export async function registerRunner (options: {
+  url: string
+  registrationToken: string
+  runnerName: string
+  runnerDescription?: string
+}) {
+  const client = new IPCClient()
+  await client.run()
+
+  await client.askRegister(options)
+
+  client.stop()
+}
+
+export async function unregisterRunner (options: {
+  url: string
+  runnerName: string
+}) {
+  const client = new IPCClient()
+  await client.run()
+
+  await client.askUnregister(options)
+
+  client.stop()
+}
+
+export async function listRegistered () {
+  const client = new IPCClient()
+  await client.run()
+
+  await client.askListRegistered()
+
+  client.stop()
+}

apps/peertube-runner/src/server/index.ts

@@ -0,0 +1 @@
+export * from './server.js'

apps/peertube-runner/src/server/process/index.ts

@@ -0,0 +1,2 @@
+export * from './shared/index.js'
+export * from './process.js'

apps/peertube-runner/src/server/process/process.ts

@@ -0,0 +1,34 @@
+import {
+  RunnerJobLiveRTMPHLSTranscodingPayload,
+  RunnerJobStudioTranscodingPayload,
+  RunnerJobVODAudioMergeTranscodingPayload,
+  RunnerJobVODHLSTranscodingPayload,
+  RunnerJobVODWebVideoTranscodingPayload
+} from '@peertube/peertube-models'
+import { logger } from '../../shared/index.js'
+import { processAudioMergeTranscoding, processHLSTranscoding, ProcessOptions, processWebVideoTranscoding } from './shared/index.js'
+import { ProcessLiveRTMPHLSTranscoding } from './shared/process-live.js'
+import { processStudioTranscoding } from './shared/process-studio.js'
+
+export async function processJob (options: ProcessOptions) {
+  const { server, job } = options
+
+  logger.info(`[${server.url}] Processing job of type ${job.type}: ${job.uuid}`, { payload: job.payload })
+
+  if (job.type === 'vod-audio-merge-transcoding') {
+    await processAudioMergeTranscoding(options as ProcessOptions<RunnerJobVODAudioMergeTranscodingPayload>)
+  } else if (job.type === 'vod-web-video-transcoding') {
+    await processWebVideoTranscoding(options as ProcessOptions<RunnerJobVODWebVideoTranscodingPayload>)
+  } else if (job.type === 'vod-hls-transcoding') {
+    await processHLSTranscoding(options as ProcessOptions<RunnerJobVODHLSTranscodingPayload>)
+  } else if (job.type === 'live-rtmp-hls-transcoding') {
+    await new ProcessLiveRTMPHLSTranscoding(options as ProcessOptions<RunnerJobLiveRTMPHLSTranscodingPayload>).process()
+  } else if (job.type === 'video-studio-transcoding') {
+    await processStudioTranscoding(options as ProcessOptions<RunnerJobStudioTranscodingPayload>)
+  } else {
+    logger.error(`Unknown job ${job.type} to process`)
+    return
+  }
+
+  logger.info(`[${server.url}] Finished processing job of type ${job.type}: ${job.uuid}`)
+}

apps/peertube-runner/src/server/process/shared/common.ts

@@ -0,0 +1,106 @@
+import { remove } from 'fs-extra/esm'
+import { join } from 'path'
+import { FFmpegEdition, FFmpegLive, FFmpegVOD, getDefaultAvailableEncoders, getDefaultEncodersToTry } from '@peertube/peertube-ffmpeg'
+import { RunnerJob, RunnerJobPayload } from '@peertube/peertube-models'
+import { buildUUID } from '@peertube/peertube-node-utils'
+import { PeerTubeServer } from '@peertube/peertube-server-commands'
+import { ConfigManager, downloadFile, logger } from '../../../shared/index.js'
+import { getTranscodingLogger } from './transcoding-logger.js'
+
+export type JobWithToken <T extends RunnerJobPayload = RunnerJobPayload> = RunnerJob<T> & { jobToken: string }
+
+export type ProcessOptions <T extends RunnerJobPayload = RunnerJobPayload> = {
+  server: PeerTubeServer
+  job: JobWithToken<T>
+  runnerToken: string
+}
+
+export async function downloadInputFile (options: {
+  url: string
+  job: JobWithToken
+  runnerToken: string
+}) {
+  const { url, job, runnerToken } = options
+  const destination = join(ConfigManager.Instance.getTranscodingDirectory(), buildUUID())
+
+  try {
+    await downloadFile({ url, jobToken: job.jobToken, runnerToken, destination })
+  } catch (err) {
+    remove(destination)
+      .catch(err => logger.error({ err }, `Cannot remove ${destination}`))
+
+    throw err
+  }
+
+  return destination
+}
+
+export function scheduleTranscodingProgress (options: {
+  server: PeerTubeServer
+  runnerToken: string
+  job: JobWithToken
+  progressGetter: () => number
+}) {
+  const { job, server, progressGetter, runnerToken } = options
+
+  const updateInterval = ConfigManager.Instance.isTestInstance()
+    ? 500
+    : 60000
+
+  const update = () => {
+    server.runnerJobs.update({ jobToken: job.jobToken, jobUUID: job.uuid, runnerToken, progress: progressGetter() })
+      .catch(err => logger.error({ err }, 'Cannot send job progress'))
+  }
+
+  const interval = setInterval(() => {
+    update()
+  }, updateInterval)
+
+  update()
+
+  return interval
+}
+
+// ---------------------------------------------------------------------------
+
+export function buildFFmpegVOD (options: {
+  onJobProgress: (progress: number) => void
+}) {
+  const { onJobProgress } = options
+
+  return new FFmpegVOD({
+    ...getCommonFFmpegOptions(),
+
+    updateJobProgress: arg => {
+      const progress = arg < 0 || arg > 100
+        ? undefined
+        : arg
+
+      onJobProgress(progress)
+    }
+  })
+}
+
+export function buildFFmpegLive () {
+  return new FFmpegLive(getCommonFFmpegOptions())
+}
+
+export function buildFFmpegEdition () {
+  return new FFmpegEdition(getCommonFFmpegOptions())
+}
+
+function getCommonFFmpegOptions () {
+  const config = ConfigManager.Instance.getConfig()
+
+  return {
+    niceness: config.ffmpeg.nice,
+    threads: config.ffmpeg.threads,
+    tmpDirectory: ConfigManager.Instance.getTranscodingDirectory(),
+    profile: 'default',
+    availableEncoders: {
+      available: getDefaultAvailableEncoders(),
+      encodersToTry: getDefaultEncodersToTry()
+    },
+    logger: getTranscodingLogger()
+  }
+}

apps/peertube-runner/src/server/process/shared/index.ts

@@ -0,0 +1,3 @@
+export * from './common.js'
+export * from './process-vod.js'
+export * from './transcoding-logger.js'

apps/peertube-runner/src/server/process/shared/process-live.ts

@@ -0,0 +1,342 @@
+import { FSWatcher, watch } from 'chokidar'
+import { FfmpegCommand } from 'fluent-ffmpeg'
+import { ensureDir, remove } from 'fs-extra/esm'
+import { basename, join } from 'path'
+import { wait } from '@peertube/peertube-core-utils'
+import { ffprobePromise, getVideoStreamBitrate, getVideoStreamDimensionsInfo, hasAudioStream } from '@peertube/peertube-ffmpeg'
+import {
+  LiveRTMPHLSTranscodingSuccess,
+  LiveRTMPHLSTranscodingUpdatePayload,
+  PeerTubeProblemDocument,
+  RunnerJobLiveRTMPHLSTranscodingPayload,
+  ServerErrorCode
+} from '@peertube/peertube-models'
+import { buildUUID } from '@peertube/peertube-node-utils'
+import { ConfigManager } from '../../../shared/config-manager.js'
+import { logger } from '../../../shared/index.js'
+import { buildFFmpegLive, ProcessOptions } from './common.js'
+
+export class ProcessLiveRTMPHLSTranscoding {
+
+  private readonly outputPath: string
+  private readonly fsWatchers: FSWatcher[] = []
+
+  // Playlist name -> chunks
+  private readonly pendingChunksPerPlaylist = new Map<string, string[]>()
+
+  private readonly playlistsCreated = new Set<string>()
+  private allPlaylistsCreated = false
+
+  private ffmpegCommand: FfmpegCommand
+
+  private ended = false
+  private errored = false
+
+  constructor (private readonly options: ProcessOptions<RunnerJobLiveRTMPHLSTranscodingPayload>) {
+    this.outputPath = join(ConfigManager.Instance.getTranscodingDirectory(), buildUUID())
+
+    logger.debug(`Using ${this.outputPath} to process live rtmp hls transcoding job ${options.job.uuid}`)
+  }
+
+  process () {
+    const job = this.options.job
+    const payload = job.payload
+
+    return new Promise<void>(async (res, rej) => {
+      try {
+        await ensureDir(this.outputPath)
+
+        logger.info(`Probing ${payload.input.rtmpUrl}`)
+        const probe = await ffprobePromise(payload.input.rtmpUrl)
+        logger.info({ probe }, `Probed ${payload.input.rtmpUrl}`)
+
+        const hasAudio = await hasAudioStream(payload.input.rtmpUrl, probe)
+        const bitrate = await getVideoStreamBitrate(payload.input.rtmpUrl, probe)
+        const { ratio } = await getVideoStreamDimensionsInfo(payload.input.rtmpUrl, probe)
+
+        const m3u8Watcher = watch(this.outputPath + '/*.m3u8')
+        this.fsWatchers.push(m3u8Watcher)
+
+        const tsWatcher = watch(this.outputPath + '/*.ts')
+        this.fsWatchers.push(tsWatcher)
+
+        m3u8Watcher.on('change', p => {
+          logger.debug(`${p} m3u8 playlist changed`)
+        })
+
+        m3u8Watcher.on('add', p => {
+          this.playlistsCreated.add(p)
+
+          if (this.playlistsCreated.size === this.options.job.payload.output.toTranscode.length + 1) {
+            this.allPlaylistsCreated = true
+            logger.info('All m3u8 playlists are created.')
+          }
+        })
+
+        tsWatcher.on('add', async p => {
+          try {
+            await this.sendPendingChunks()
+          } catch (err) {
+            this.onUpdateError({ err, rej, res })
+          }
+
+          const playlistName = this.getPlaylistIdFromTS(p)
+
+          const pendingChunks = this.pendingChunksPerPlaylist.get(playlistName) || []
+          pendingChunks.push(p)
+
+          this.pendingChunksPerPlaylist.set(playlistName, pendingChunks)
+        })
+
+        tsWatcher.on('unlink', p => {
+          this.sendDeletedChunkUpdate(p)
+            .catch(err => this.onUpdateError({ err, rej, res }))
+        })
+
+        this.ffmpegCommand = await buildFFmpegLive().getLiveTranscodingCommand({
+          inputUrl: payload.input.rtmpUrl,
+
+          outPath: this.outputPath,
+          masterPlaylistName: 'master.m3u8',
+
+          segmentListSize: payload.output.segmentListSize,
+          segmentDuration: payload.output.segmentDuration,
+
+          toTranscode: payload.output.toTranscode,
+
+          bitrate,
+          ratio,
+
+          hasAudio,
+          probe
+        })
+
+        logger.info(`Running live transcoding for ${payload.input.rtmpUrl}`)
+
+        this.ffmpegCommand.on('error', (err, stdout, stderr) => {
+          this.onFFmpegError({ err, stdout, stderr })
+
+          res()
+        })
+
+        this.ffmpegCommand.on('end', () => {
+          this.onFFmpegEnded()
+            .catch(err => logger.error({ err }, 'Error in FFmpeg end handler'))
+
+          res()
+        })
+
+        this.ffmpegCommand.run()
+      } catch (err) {
+        rej(err)
+      }
+    })
+  }
+
+  // ---------------------------------------------------------------------------
+
+  private onUpdateError (options: {
+    err: Error
+    res: () => void
+    rej: (reason?: any) => void
+  }) {
+    const { err, res, rej } = options
+
+    if (this.errored) return
+    if (this.ended) return
+
+    this.errored = true
+
+    this.ffmpegCommand.kill('SIGINT')
+
+    const type = ((err as any).res?.body as PeerTubeProblemDocument)?.code
+    if (type === ServerErrorCode.RUNNER_JOB_NOT_IN_PROCESSING_STATE) {
+      logger.info('Stopping transcoding as the job is not in processing state anymore')
+
+      this.sendSuccess()
+        .catch(err => logger.error({ err }, 'Cannot send success'))
+
+      res()
+    } else {
+      logger.error({ err }, 'Cannot send update after added/deleted chunk, stopping live transcoding')
+
+      this.sendError(err)
+        .catch(subErr => logger.error({ err: subErr }, 'Cannot send error'))
+
+      rej(err)
+    }
+
+    this.cleanup()
+  }
+
+  // ---------------------------------------------------------------------------
+
+  private onFFmpegError (options: {
+    err: any
+    stdout: string
+    stderr: string
+  }) {
+    const { err, stdout, stderr } = options
+
+    // Don't care that we killed the ffmpeg process
+    if (err?.message?.includes('Exiting normally')) return
+    if (this.errored) return
+    if (this.ended) return
+
+    this.errored = true
+
+    logger.error({ err, stdout, stderr }, 'FFmpeg transcoding error.')
+
+    this.sendError(err)
+      .catch(subErr => logger.error({ err: subErr }, 'Cannot send error'))
+
+    this.cleanup()
+  }
+
+  private async sendError (err: Error) {
+    await this.options.server.runnerJobs.error({
+      jobToken: this.options.job.jobToken,
+      jobUUID: this.options.job.uuid,
+      runnerToken: this.options.runnerToken,
+      message: err.message
+    })
+  }
+
+  // ---------------------------------------------------------------------------
+
+  private async onFFmpegEnded () {
+    if (this.ended) return
+
+    this.ended = true
+    logger.info('FFmpeg ended, sending success to server')
+
+    // Wait last ffmpeg chunks generation
+    await wait(1500)
+
+    this.sendSuccess()
+      .catch(err => logger.error({ err }, 'Cannot send success'))
+
+    this.cleanup()
+  }
+
+  private async sendSuccess () {
+    const successBody: LiveRTMPHLSTranscodingSuccess = {}
+
+    await this.options.server.runnerJobs.success({
+      jobToken: this.options.job.jobToken,
+      jobUUID: this.options.job.uuid,
+      runnerToken: this.options.runnerToken,
+      payload: successBody
+    })
+  }
+
+  // ---------------------------------------------------------------------------
+
+  private sendDeletedChunkUpdate (deletedChunk: string): Promise<any> {
+    if (this.ended) return Promise.resolve()
+
+    logger.debug(`Sending removed live chunk ${deletedChunk} update`)
+
+    const videoChunkFilename = basename(deletedChunk)
+
+    let payload: LiveRTMPHLSTranscodingUpdatePayload = {
+      type: 'remove-chunk',
+      videoChunkFilename
+    }
+
+    if (this.allPlaylistsCreated) {
+      const playlistName = this.getPlaylistName(videoChunkFilename)
+
+      payload = {
+        ...payload,
+        masterPlaylistFile: join(this.outputPath, 'master.m3u8'),
+        resolutionPlaylistFilename: playlistName,
+        resolutionPlaylistFile: join(this.outputPath, playlistName)
+      }
+    }
+
+    return this.updateWithRetry(payload)
+  }
+
+  private async sendPendingChunks (): Promise<any> {
+    if (this.ended) return Promise.resolve()
+
+    const promises: Promise<any>[] = []
+
+    for (const playlist of this.pendingChunksPerPlaylist.keys()) {
+      for (const chunk of this.pendingChunksPerPlaylist.get(playlist)) {
+        logger.debug(`Sending added live chunk ${chunk} update`)
+
+        const videoChunkFilename = basename(chunk)
+
+        let payload: LiveRTMPHLSTranscodingUpdatePayload = {
+          type: 'add-chunk',
+          videoChunkFilename,
+          videoChunkFile: chunk
+        }
+
+        if (this.allPlaylistsCreated) {
+          const playlistName = this.getPlaylistName(videoChunkFilename)
+
+          payload = {
+            ...payload,
+            masterPlaylistFile: join(this.outputPath, 'master.m3u8'),
+            resolutionPlaylistFilename: playlistName,
+            resolutionPlaylistFile: join(this.outputPath, playlistName)
+          }
+        }
+
+        promises.push(this.updateWithRetry(payload))
+      }
+
+      this.pendingChunksPerPlaylist.set(playlist, [])
+    }
+
+    await Promise.all(promises)
+  }
+
+  private async updateWithRetry (payload: LiveRTMPHLSTranscodingUpdatePayload, currentTry = 1): Promise<any> {
+    if (this.ended || this.errored) return
+
+    try {
+      await this.options.server.runnerJobs.update({
+        jobToken: this.options.job.jobToken,
+        jobUUID: this.options.job.uuid,
+        runnerToken: this.options.runnerToken,
+        payload
+      })
+    } catch (err) {
+      if (currentTry >= 3) throw err
+      if ((err.res?.body as PeerTubeProblemDocument)?.code === ServerErrorCode.RUNNER_JOB_NOT_IN_PROCESSING_STATE) throw err
+
+      logger.warn({ err }, 'Will retry update after error')
+      await wait(250)
+
+      return this.updateWithRetry(payload, currentTry + 1)
+    }
+  }
+
+  private getPlaylistName (videoChunkFilename: string) {
+    return `${videoChunkFilename.split('-')[0]}.m3u8`
+  }
+
+  private getPlaylistIdFromTS (segmentPath: string) {
+    const playlistIdMatcher = /^([\d+])-/
+
+    return basename(segmentPath).match(playlistIdMatcher)[1]
+  }
+
+  // ---------------------------------------------------------------------------
+
+  private cleanup () {
+    logger.debug(`Cleaning up job ${this.options.job.uuid}`)
+
+    for (const fsWatcher of this.fsWatchers) {
+      fsWatcher.close()
+        .catch(err => logger.error({ err }, 'Cannot close watcher'))
+    }
+
+    remove(this.outputPath)
+      .catch(err => logger.error({ err }, `Cannot remove ${this.outputPath}`))
+  }
+}

apps/peertube-runner/src/server/process/shared/process-studio.ts

@@ -0,0 +1,165 @@
+import { remove } from 'fs-extra/esm'
+import { join } from 'path'
+import { pick } from '@peertube/peertube-core-utils'
+import {
+  RunnerJobStudioTranscodingPayload,
+  VideoStudioTask,
+  VideoStudioTaskCutPayload,
+  VideoStudioTaskIntroPayload,
+  VideoStudioTaskOutroPayload,
+  VideoStudioTaskPayload,
+  VideoStudioTaskWatermarkPayload,
+  VideoStudioTranscodingSuccess
+} from '@peertube/peertube-models'
+import { buildUUID } from '@peertube/peertube-node-utils'
+import { ConfigManager } from '../../../shared/config-manager.js'
+import { logger } from '../../../shared/index.js'
+import { buildFFmpegEdition, downloadInputFile, JobWithToken, ProcessOptions, scheduleTranscodingProgress } from './common.js'
+
+export async function processStudioTranscoding (options: ProcessOptions<RunnerJobStudioTranscodingPayload>) {
+  const { server, job, runnerToken } = options
+  const payload = job.payload
+
+  let inputPath: string
+  let outputPath: string
+  let tmpInputFilePath: string
+
+  let tasksProgress = 0
+
+  const updateProgressInterval = scheduleTranscodingProgress({
+    job,
+    server,
+    runnerToken,
+    progressGetter: () => tasksProgress
+  })
+
+  try {
+    logger.info(`Downloading input file ${payload.input.videoFileUrl} for job ${job.jobToken}`)
+
+    inputPath = await downloadInputFile({ url: payload.input.videoFileUrl, runnerToken, job })
+    tmpInputFilePath = inputPath
+
+    logger.info(`Input file ${payload.input.videoFileUrl} downloaded for job ${job.jobToken}. Running studio transcoding tasks.`)
+
+    for (const task of payload.tasks) {
+      const outputFilename = 'output-edition-' + buildUUID() + '.mp4'
+      outputPath = join(ConfigManager.Instance.getTranscodingDirectory(), outputFilename)
+
+      await processTask({
+        inputPath: tmpInputFilePath,
+        outputPath,
+        task,
+        job,
+        runnerToken
+      })
+
+      if (tmpInputFilePath) await remove(tmpInputFilePath)
+
+      // For the next iteration
+      tmpInputFilePath = outputPath
+
+      tasksProgress += Math.floor(100 / payload.tasks.length)
+    }
+
+    const successBody: VideoStudioTranscodingSuccess = {
+      videoFile: outputPath
+    }
+
+    await server.runnerJobs.success({
+      jobToken: job.jobToken,
+      jobUUID: job.uuid,
+      runnerToken,
+      payload: successBody
+    })
+  } finally {
+    if (tmpInputFilePath) await remove(tmpInputFilePath)
+    if (outputPath) await remove(outputPath)
+    if (updateProgressInterval) clearInterval(updateProgressInterval)
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Private
+// ---------------------------------------------------------------------------
+
+type TaskProcessorOptions <T extends VideoStudioTaskPayload = VideoStudioTaskPayload> = {
+  inputPath: string
+  outputPath: string
+  task: T
+  runnerToken: string
+  job: JobWithToken
+}
+
+const taskProcessors: { [id in VideoStudioTask['name']]: (options: TaskProcessorOptions) => Promise<any> } = {
+  'add-intro': processAddIntroOutro,
+  'add-outro': processAddIntroOutro,
+  'cut': processCut,
+  'add-watermark': processAddWatermark
+}
+
+async function processTask (options: TaskProcessorOptions) {
+  const { task } = options
+
+  const processor = taskProcessors[options.task.name]
+  if (!process) throw new Error('Unknown task ' + task.name)
+
+  return processor(options)
+}
+
+async function processAddIntroOutro (options: TaskProcessorOptions<VideoStudioTaskIntroPayload | VideoStudioTaskOutroPayload>) {
+  const { inputPath, task, runnerToken, job } = options
+
+  logger.debug('Adding intro/outro to ' + inputPath)
+
+  const introOutroPath = await downloadInputFile({ url: task.options.file, runnerToken, job })
+
+  try {
+    await buildFFmpegEdition().addIntroOutro({
+      ...pick(options, [ 'inputPath', 'outputPath' ]),
+
+      introOutroPath,
+      type: task.name === 'add-intro'
+        ? 'intro'
+        : 'outro'
+    })
+  } finally {
+    await remove(introOutroPath)
+  }
+}
+
+function processCut (options: TaskProcessorOptions<VideoStudioTaskCutPayload>) {
+  const { inputPath, task } = options
+
+  logger.debug(`Cutting ${inputPath}`)
+
+  return buildFFmpegEdition().cutVideo({
+    ...pick(options, [ 'inputPath', 'outputPath' ]),
+
+    start: task.options.start,
+    end: task.options.end
+  })
+}
+
+async function processAddWatermark (options: TaskProcessorOptions<VideoStudioTaskWatermarkPayload>) {
+  const { inputPath, task, runnerToken, job } = options
+
+  logger.debug('Adding watermark to ' + inputPath)
+
+  const watermarkPath = await downloadInputFile({ url: task.options.file, runnerToken, job })
+
+  try {
+    await buildFFmpegEdition().addWatermark({
+      ...pick(options, [ 'inputPath', 'outputPath' ]),
+
+      watermarkPath,
+
+      videoFilters: {
+        watermarkSizeRatio: task.options.watermarkSizeRatio,
+        horitonzalMarginRatio: task.options.horitonzalMarginRatio,
+        verticalMarginRatio: task.options.verticalMarginRatio
+      }
+    })
+  } finally {
+    await remove(watermarkPath)
+  }
+}

apps/peertube-runner/src/server/process/shared/process-vod.ts

@@ -0,0 +1,201 @@
+import { remove } from 'fs-extra/esm'
+import { join } from 'path'
+import {
+  RunnerJobVODAudioMergeTranscodingPayload,
+  RunnerJobVODHLSTranscodingPayload,
+  RunnerJobVODWebVideoTranscodingPayload,
+  VODAudioMergeTranscodingSuccess,
+  VODHLSTranscodingSuccess,
+  VODWebVideoTranscodingSuccess
+} from '@peertube/peertube-models'
+import { buildUUID } from '@peertube/peertube-node-utils'
+import { ConfigManager } from '../../../shared/config-manager.js'
+import { logger } from '../../../shared/index.js'
+import { buildFFmpegVOD, downloadInputFile, ProcessOptions, scheduleTranscodingProgress } from './common.js'
+
+export async function processWebVideoTranscoding (options: ProcessOptions<RunnerJobVODWebVideoTranscodingPayload>) {
+  const { server, job, runnerToken } = options
+
+  const payload = job.payload
+
+  let ffmpegProgress: number
+  let inputPath: string
+
+  const outputPath = join(ConfigManager.Instance.getTranscodingDirectory(), `output-${buildUUID()}.mp4`)
+
+  const updateProgressInterval = scheduleTranscodingProgress({
+    job,
+    server,
+    runnerToken,
+    progressGetter: () => ffmpegProgress
+  })
+
+  try {
+    logger.info(`Downloading input file ${payload.input.videoFileUrl} for web video transcoding job ${job.jobToken}`)
+
+    inputPath = await downloadInputFile({ url: payload.input.videoFileUrl, runnerToken, job })
+
+    logger.info(`Downloaded input file ${payload.input.videoFileUrl} for job ${job.jobToken}. Running web video transcoding.`)
+
+    const ffmpegVod = buildFFmpegVOD({
+      onJobProgress: progress => { ffmpegProgress = progress }
+    })
+
+    await ffmpegVod.transcode({
+      type: 'video',
+
+      inputPath,
+
+      outputPath,
+
+      inputFileMutexReleaser: () => {},
+
+      resolution: payload.output.resolution,
+      fps: payload.output.fps
+    })
+
+    const successBody: VODWebVideoTranscodingSuccess = {
+      videoFile: outputPath
+    }
+
+    await server.runnerJobs.success({
+      jobToken: job.jobToken,
+      jobUUID: job.uuid,
+      runnerToken,
+      payload: successBody
+    })
+  } finally {
+    if (inputPath) await remove(inputPath)
+    if (outputPath) await remove(outputPath)
+    if (updateProgressInterval) clearInterval(updateProgressInterval)
+  }
+}
+
+export async function processHLSTranscoding (options: ProcessOptions<RunnerJobVODHLSTranscodingPayload>) {
+  const { server, job, runnerToken } = options
+  const payload = job.payload
+
+  let ffmpegProgress: number
+  let inputPath: string
+
+  const uuid = buildUUID()
+  const outputPath = join(ConfigManager.Instance.getTranscodingDirectory(), `${uuid}-${payload.output.resolution}.m3u8`)
+  const videoFilename = `${uuid}-${payload.output.resolution}-fragmented.mp4`
+  const videoPath = join(join(ConfigManager.Instance.getTranscodingDirectory(), videoFilename))
+
+  const updateProgressInterval = scheduleTranscodingProgress({
+    job,
+    server,
+    runnerToken,
+    progressGetter: () => ffmpegProgress
+  })
+
+  try {
+    logger.info(`Downloading input file ${payload.input.videoFileUrl} for HLS transcoding job ${job.jobToken}`)
+
+    inputPath = await downloadInputFile({ url: payload.input.videoFileUrl, runnerToken, job })
+
+    logger.info(`Downloaded input file ${payload.input.videoFileUrl} for job ${job.jobToken}. Running HLS transcoding.`)
+
+    const ffmpegVod = buildFFmpegVOD({
+      onJobProgress: progress => { ffmpegProgress = progress }
+    })
+
+    await ffmpegVod.transcode({
+      type: 'hls',
+      copyCodecs: false,
+      inputPath,
+      hlsPlaylist: { videoFilename },
+      outputPath,
+
+      inputFileMutexReleaser: () => {},
+
+      resolution: payload.output.resolution,
+      fps: payload.output.fps
+    })
+
+    const successBody: VODHLSTranscodingSuccess = {
+      resolutionPlaylistFile: outputPath,
+      videoFile: videoPath
+    }
+
+    await server.runnerJobs.success({
+      jobToken: job.jobToken,
+      jobUUID: job.uuid,
+      runnerToken,
+      payload: successBody
+    })
+  } finally {
+    if (inputPath) await remove(inputPath)
+    if (outputPath) await remove(outputPath)
+    if (videoPath) await remove(videoPath)
+    if (updateProgressInterval) clearInterval(updateProgressInterval)
+  }
+}
+
+export async function processAudioMergeTranscoding (options: ProcessOptions<RunnerJobVODAudioMergeTranscodingPayload>) {
+  const { server, job, runnerToken } = options
+  const payload = job.payload
+
+  let ffmpegProgress: number
+  let audioPath: string
+  let inputPath: string
+
+  const outputPath = join(ConfigManager.Instance.getTranscodingDirectory(), `output-${buildUUID()}.mp4`)
+
+  const updateProgressInterval = scheduleTranscodingProgress({
+    job,
+    server,
+    runnerToken,
+    progressGetter: () => ffmpegProgress
+  })
+
+  try {
+    logger.info(
+      `Downloading input files ${payload.input.audioFileUrl} and ${payload.input.previewFileUrl} ` +
+      `for audio merge transcoding job ${job.jobToken}`
+    )
+
+    audioPath = await downloadInputFile({ url: payload.input.audioFileUrl, runnerToken, job })
+    inputPath = await downloadInputFile({ url: payload.input.previewFileUrl, runnerToken, job })
+
+    logger.info(
+      `Downloaded input files ${payload.input.audioFileUrl} and ${payload.input.previewFileUrl} ` +
+      `for job ${job.jobToken}. Running audio merge transcoding.`
+    )
+
+    const ffmpegVod = buildFFmpegVOD({
+      onJobProgress: progress => { ffmpegProgress = progress }
+    })
+
+    await ffmpegVod.transcode({
+      type: 'merge-audio',
+
+      audioPath,
+      inputPath,
+
+      outputPath,
+
+      inputFileMutexReleaser: () => {},
+
+      resolution: payload.output.resolution,
+      fps: payload.output.fps
+    })
+
+    const successBody: VODAudioMergeTranscodingSuccess = {
+      videoFile: outputPath
+    }
+
+    await server.runnerJobs.success({
+      jobToken: job.jobToken,
+      jobUUID: job.uuid,
+      runnerToken,
+      payload: successBody
+    })
+  } finally {
+    if (audioPath) await remove(audioPath)
+    if (inputPath) await remove(inputPath)
+    if (outputPath) await remove(outputPath)
+    if (updateProgressInterval) clearInterval(updateProgressInterval)
+  }
+}

apps/peertube-runner/src/server/process/shared/transcoding-logger.ts

@@ -0,0 +1,19 @@
+import { LogFn } from 'pino'
+import { logger } from '../../../shared/index.js'
+
+export function getTranscodingLogger () {
+  return {
+    info: buildWinstonLogger(logger.info.bind(logger)),
+    debug: buildWinstonLogger(logger.debug.bind(logger)),
+    warn: buildWinstonLogger(logger.warn.bind(logger)),
+    error: buildWinstonLogger(logger.error.bind(logger))
+  }
+}
+
+function buildWinstonLogger (log: LogFn) {
+  return (arg1: string, arg2?: object) => {
+    if (arg2) return log(arg2, arg1)
+
+    return log(arg1)
+  }
+}

apps/peertube-runner/src/server/server.ts

@@ -0,0 +1,322 @@
+import { ensureDir, remove } from 'fs-extra/esm'
+import { readdir } from 'fs/promises'
+import { join } from 'path'
+import { io, Socket } from 'socket.io-client'
+import { pick, shuffle, wait } from '@peertube/peertube-core-utils'
+import { PeerTubeProblemDocument, ServerErrorCode } from '@peertube/peertube-models'
+import { PeerTubeServer as PeerTubeServerCommand } from '@peertube/peertube-server-commands'
+import { ConfigManager } from '../shared/index.js'
+import { IPCServer } from '../shared/ipc/index.js'
+import { logger } from '../shared/logger.js'
+import { JobWithToken, processJob } from './process/index.js'
+import { isJobSupported } from './shared/index.js'
+
+type PeerTubeServer = PeerTubeServerCommand & {
+  runnerToken: string
+  runnerName: string
+  runnerDescription?: string
+}
+
+export class RunnerServer {
+  private static instance: RunnerServer
+
+  private servers: PeerTubeServer[] = []
+  private processingJobs: { job: JobWithToken, server: PeerTubeServer }[] = []
+
+  private checkingAvailableJobs = false
+
+  private cleaningUp = false
+  private initialized = false
+
+  private readonly sockets = new Map<PeerTubeServer, Socket>()
+
+  private constructor () {}
+
+  async run () {
+    logger.info('Running PeerTube runner in server mode')
+
+    await ConfigManager.Instance.load()
+
+    for (const registered of ConfigManager.Instance.getConfig().registeredInstances) {
+      const serverCommand = new PeerTubeServerCommand({ url: registered.url })
+
+      this.loadServer(Object.assign(serverCommand, registered))
+
+      logger.info(`Loading registered instance ${registered.url}`)
+    }
+
+    // Run IPC
+    const ipcServer = new IPCServer()
+    try {
+      await ipcServer.run(this)
+    } catch (err) {
+      logger.error('Cannot start local socket for IPC communication', err)
+      process.exit(-1)
+    }
+
+    // Cleanup on exit
+    for (const code of [ 'SIGTERM', 'SIGINT', 'SIGUSR1', 'SIGUSR2', 'uncaughtException' ]) {
+      process.on(code, async (err, origin) => {
+        if (code === 'uncaughtException') {
+          logger.error({ err, origin }, 'uncaughtException')
+        }
+
+        await this.onExit()
+      })
+    }
+
+    // Process jobs
+    await ensureDir(ConfigManager.Instance.getTranscodingDirectory())
+    await this.cleanupTMP()
+
+    logger.info(`Using ${ConfigManager.Instance.getTranscodingDirectory()} for transcoding directory`)
+
+    this.initialized = true
+    await this.checkAvailableJobs()
+  }
+
+  // ---------------------------------------------------------------------------
+
+  async registerRunner (options: {
+    url: string
+    registrationToken: string
+    runnerName: string
+    runnerDescription?: string
+  }) {
+    const { url, registrationToken, runnerName, runnerDescription } = options
+
+    logger.info(`Registering runner ${runnerName} on ${url}...`)
+
+    const serverCommand = new PeerTubeServerCommand({ url })
+    const { runnerToken } = await serverCommand.runners.register({ name: runnerName, description: runnerDescription, registrationToken })
+
+    const server: PeerTubeServer = Object.assign(serverCommand, {
+      runnerToken,
+      runnerName,
+      runnerDescription
+    })
+
+    this.loadServer(server)
+    await this.saveRegisteredInstancesInConf()
+
+    logger.info(`Registered runner ${runnerName} on ${url}`)
+  }
+
+  private loadServer (server: PeerTubeServer) {
+    this.servers.push(server)
+
+    const url = server.url + '/runners'
+    const socket = io(url, {
+      auth: {
+        runnerToken: server.runnerToken
+      },
+      transports: [ 'websocket' ]
+    })
+
+    socket.on('connect_error', err => logger.warn({ err }, `Cannot connect to ${url} socket`))
+    socket.on('available-jobs', () => this.safeAsyncCheckAvailableJobs())
+
+    socket.on('connect', () => {
+      logger.info(`Connected to ${url} socket`)
+
+      this.safeAsyncCheckAvailableJobs()
+    })
+    socket.on('disconnect', () => logger.warn(`Disconnected from ${url} socket`))
+    socket.io.on('ping', () => logger.debug(`Received a "ping" for ${url}`))
+
+    this.sockets.set(server, socket)
+  }
+
+  async unregisterRunner (options: {
+    url: string
+    runnerName: string
+  }) {
+    const { url, runnerName } = options
+
+    const server = this.servers.find(s => s.url === url && s.runnerName === runnerName)
+    if (!server) {
+      logger.error(`Unknown server ${url} - ${runnerName} to unregister`)
+      return
+    }
+
+    logger.info(`Unregistering runner ${runnerName} on ${url}...`)
+
+    try {
+      await server.runners.unregister({ runnerToken: server.runnerToken })
+    } catch (err) {
+      logger.error({ err }, `Cannot unregister runner ${runnerName} on ${url}`)
+    }
+
+    this.unloadServer(server)
+    await this.saveRegisteredInstancesInConf()
+
+    logger.info(`Unregistered runner ${runnerName} on ${url}`)
+  }
+
+  private unloadServer (server: PeerTubeServer) {
+    this.servers = this.servers.filter(s => s !== server)
+
+    const socket = this.sockets.get(server)
+    socket.disconnect()
+
+    this.sockets.delete(server)
+  }
+
+  listRegistered () {
+    return {
+      servers: this.servers.map(s => {
+        return {
+          url: s.url,
+          runnerName: s.runnerName,
+          runnerDescription: s.runnerDescription
+        }
+      })
+    }
+  }
+
+  // ---------------------------------------------------------------------------
+
+  private safeAsyncCheckAvailableJobs () {
+    this.checkAvailableJobs()
+      .catch(err => logger.error({ err }, `Cannot check available jobs`))
+  }
+
+  private async checkAvailableJobs () {
+    if (!this.initialized) return
+    if (this.checkingAvailableJobs) return
+
+    this.checkingAvailableJobs = true
+
+    let hadAvailableJob = false
+
+    for (const server of shuffle([ ...this.servers ])) {
+      try {
+        logger.info('Checking available jobs on ' + server.url)
+
+        const job = await this.requestJob(server)
+        if (!job) continue
+
+        hadAvailableJob = true
+
+        await this.tryToExecuteJobAsync(server, job)
+      } catch (err) {
+        hadAvailableJob = false
+
+        const code = (err.res?.body as PeerTubeProblemDocument)?.code
+
+        if (code === ServerErrorCode.RUNNER_JOB_NOT_IN_PENDING_STATE) {
+          logger.debug({ err }, 'Runner job is not in pending state anymore, retry later')
+          continue
+        }
+
+        if (code === ServerErrorCode.UNKNOWN_RUNNER_TOKEN) {
+          logger.error({ err }, `Unregistering ${server.url} as the runner token ${server.runnerToken} is invalid`)
+
+          await this.unregisterRunner({ url: server.url, runnerName: server.runnerName })
+          continue
+        }
+
+        logger.error({ err }, `Cannot request/accept job on ${server.url} for runner ${server.runnerName}`)
+      }
+    }
+
+    this.checkingAvailableJobs = false
+
+    if (hadAvailableJob && this.canProcessMoreJobs()) {
+      await wait(2500)
+
+      this.checkAvailableJobs()
+        .catch(err => logger.error({ err }, 'Cannot check more available jobs'))
+    }
+  }
+
+  private async requestJob (server: PeerTubeServer) {
+    logger.debug(`Requesting jobs on ${server.url} for runner ${server.runnerName}`)
+
+    const { availableJobs } = await server.runnerJobs.request({ runnerToken: server.runnerToken })
+
+    const filtered = availableJobs.filter(j => isJobSupported(j))
+
+    if (filtered.length === 0) {
+      logger.debug(`No job available on ${server.url} for runner ${server.runnerName}`)
+      return undefined
+    }
+
+    return filtered[0]
+  }
+
+  private async tryToExecuteJobAsync (server: PeerTubeServer, jobToAccept: { uuid: string }) {
+    if (!this.canProcessMoreJobs()) return
+
+    const { job } = await server.runnerJobs.accept({ runnerToken: server.runnerToken, jobUUID: jobToAccept.uuid })
+
+    const processingJob = { job, server }
+    this.processingJobs.push(processingJob)
+
+    processJob({ server, job, runnerToken: server.runnerToken })
+      .catch(err => {
+        logger.error({ err }, 'Cannot process job')
+
+        server.runnerJobs.error({ jobToken: job.jobToken, jobUUID: job.uuid, runnerToken: server.runnerToken, message: err.message })
+          .catch(err2 => logger.error({ err: err2 }, 'Cannot abort job after error'))
+      })
+      .finally(() => {
+        this.processingJobs = this.processingJobs.filter(p => p !== processingJob)
+
+        return this.checkAvailableJobs()
+      })
+  }
+
+  // ---------------------------------------------------------------------------
+
+  private saveRegisteredInstancesInConf () {
+    const data = this.servers.map(s => {
+      return pick(s, [ 'url', 'runnerToken', 'runnerName', 'runnerDescription' ])
+    })
+
+    return ConfigManager.Instance.setRegisteredInstances(data)
+  }
+
+  private canProcessMoreJobs () {
+    return this.processingJobs.length < ConfigManager.Instance.getConfig().jobs.concurrency
+  }
+
+  // ---------------------------------------------------------------------------
+
+  private async cleanupTMP () {
+    const files = await readdir(ConfigManager.Instance.getTranscodingDirectory())
+
+    for (const file of files) {
+      await remove(join(ConfigManager.Instance.getTranscodingDirectory(), file))
+    }
+  }
+
+  private async onExit () {
+    if (this.cleaningUp) return
+    this.cleaningUp = true
+
+    logger.info('Cleaning up after program exit')
+
+    try {
+      for (const { server, job } of this.processingJobs) {
+        await server.runnerJobs.abort({
+          jobToken: job.jobToken,
+          jobUUID: job.uuid,
+          reason: 'Runner stopped',
+          runnerToken: server.runnerToken
+        })
+      }
+
+      await this.cleanupTMP()
+    } catch (err) {
+      logger.error(err)
+      process.exit(-1)
+    }
+
+    process.exit()
+  }
+
+  static get Instance () {
+    return this.instance || (this.instance = new this())
+  }
+}

apps/peertube-runner/src/server/shared/index.ts

@@ -0,0 +1 @@
+export * from './supported-job.js'

apps/peertube-runner/src/server/shared/supported-job.ts

@@ -0,0 +1,43 @@
+import {
+  RunnerJobLiveRTMPHLSTranscodingPayload,
+  RunnerJobPayload,
+  RunnerJobType,
+  RunnerJobStudioTranscodingPayload,
+  RunnerJobVODAudioMergeTranscodingPayload,
+  RunnerJobVODHLSTranscodingPayload,
+  RunnerJobVODWebVideoTranscodingPayload,
+  VideoStudioTaskPayload
+} from '@peertube/peertube-models'
+
+const supportedMatrix = {
+  'vod-web-video-transcoding': (_payload: RunnerJobVODWebVideoTranscodingPayload) => {
+    return true
+  },
+  'vod-hls-transcoding': (_payload: RunnerJobVODHLSTranscodingPayload) => {
+    return true
+  },
+  'vod-audio-merge-transcoding': (_payload: RunnerJobVODAudioMergeTranscodingPayload) => {
+    return true
+  },
+  'live-rtmp-hls-transcoding': (_payload: RunnerJobLiveRTMPHLSTranscodingPayload) => {
+    return true
+  },
+  'video-studio-transcoding': (payload: RunnerJobStudioTranscodingPayload) => {
+    const tasks = payload?.tasks
+    const supported = new Set<VideoStudioTaskPayload['name']>([ 'add-intro', 'add-outro', 'add-watermark', 'cut' ])
+
+    if (!Array.isArray(tasks)) return false
+
+    return tasks.every(t => t && supported.has(t.name))
+  }
+}
+
+export function isJobSupported (job: {
+  type: RunnerJobType
+  payload: RunnerJobPayload
+}) {
+  const fn = supportedMatrix[job.type]
+  if (!fn) return false
+
+  return fn(job.payload as any)
+}

apps/peertube-runner/src/shared/config-manager.ts

@@ -0,0 +1,140 @@
+import { parse, stringify } from '@iarna/toml'
+import envPaths from 'env-paths'
+import { ensureDir, pathExists, remove } from 'fs-extra/esm'
+import { readFile, writeFile } from 'fs/promises'
+import merge from 'lodash-es/merge.js'
+import { dirname, join } from 'path'
+import { logger } from '../shared/index.js'
+
+const paths = envPaths('peertube-runner')
+
+type Config = {
+  jobs: {
+    concurrency: number
+  }
+
+  ffmpeg: {
+    threads: number
+    nice: number
+  }
+
+  registeredInstances: {
+    url: string
+    runnerToken: string
+    runnerName: string
+    runnerDescription?: string
+  }[]
+}
+
+export class ConfigManager {
+  private static instance: ConfigManager
+
+  private config: Config = {
+    jobs: {
+      concurrency: 2
+    },
+    ffmpeg: {
+      threads: 2,
+      nice: 20
+    },
+    registeredInstances: []
+  }
+
+  private id: string
+  private configFilePath: string
+
+  private constructor () {}
+
+  init (id: string) {
+    this.id = id
+    this.configFilePath = join(this.getConfigDir(), 'config.toml')
+  }
+
+  async load () {
+    logger.info(`Using ${this.configFilePath} as configuration file`)
+
+    if (this.isTestInstance()) {
+      logger.info('Removing configuration file as we are using the "test" id')
+      await remove(this.configFilePath)
+    }
+
+    await ensureDir(dirname(this.configFilePath))
+
+    if (!await pathExists(this.configFilePath)) {
+      await this.save()
+    }
+
+    const file = await readFile(this.configFilePath, 'utf-8')
+
+    this.config = merge(this.config, parse(file))
+  }
+
+  save () {
+    return writeFile(this.configFilePath, stringify(this.config))
+  }
+
+  // ---------------------------------------------------------------------------
+
+  async setRegisteredInstances (registeredInstances: {
+    url: string
+    runnerToken: string
+    runnerName: string
+    runnerDescription?: string
+  }[]) {
+    this.config.registeredInstances = registeredInstances
+
+    await this.save()
+  }
+
+  // ---------------------------------------------------------------------------
+
+  getConfig () {
+    return this.deepFreeze(this.config)
+  }
+
+  // ---------------------------------------------------------------------------
+
+  getTranscodingDirectory () {
+    return join(paths.cache, this.id, 'transcoding')
+  }
+
+  getSocketDirectory () {
+    return join(paths.data, this.id)
+  }
+
+  getSocketPath () {
+    return join(this.getSocketDirectory(), 'peertube-runner.sock')
+  }
+
+  getConfigDir () {
+    return join(paths.config, this.id)
+  }
+
+  // ---------------------------------------------------------------------------
+
+  isTestInstance () {
+    return typeof this.id === 'string' && this.id.match(/^test-\d$/)
+  }
+
+  // ---------------------------------------------------------------------------
+
+  // Thanks: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/freeze
+  private deepFreeze <T extends object> (object: T) {
+    const propNames = Reflect.ownKeys(object)
+
+    // Freeze properties before freezing self
+    for (const name of propNames) {
+      const value = object[name]
+
+      if ((value && typeof value === 'object') || typeof value === 'function') {
+        this.deepFreeze(value)
+      }
+    }
+
+    return Object.freeze({ ...object })
+  }
+
+  static get Instance () {
+    return this.instance || (this.instance = new this())
+  }
+}

apps/peertube-runner/src/shared/http.ts

@@ -0,0 +1,67 @@
+import { createWriteStream } from 'fs'
+import { remove } from 'fs-extra/esm'
+import { RequestOptions } from 'https'
+import { http, https } from 'follow-redirects'
+import { logger } from './logger.js'
+
+export function downloadFile (options: {
+  url: string
+  destination: string
+  runnerToken: string
+  jobToken: string
+}) {
+  const { url, destination, runnerToken, jobToken } = options
+
+  logger.debug(`Downloading file ${url}`)
+
+  return new Promise<void>((res, rej) => {
+    const parsed = new URL(url)
+
+    const body = JSON.stringify({
+      runnerToken,
+      jobToken
+    })
+
+    const getOptions: RequestOptions = {
+      method: 'POST',
+      hostname: parsed.hostname,
+      port: parsed.port,
+      path: parsed.pathname,
+      headers: {
+        'Content-Type': 'application/json',
+        'Content-Length': Buffer.byteLength(body, 'utf-8')
+      }
+    }
+
+    const request = getRequest(url)(getOptions, response => {
+      const code = response.statusCode ?? 0
+
+      if (code >= 400) {
+        return rej(new Error(response.statusMessage))
+      }
+
+      const file = createWriteStream(destination)
+      file.on('finish', () => res())
+
+      response.pipe(file)
+    })
+
+    request.on('error', err => {
+      remove(destination)
+        .catch(err => logger.error(err))
+
+      return rej(err)
+    })
+
+    request.write(body)
+    request.end()
+  })
+}
+
+// ---------------------------------------------------------------------------
+
+function getRequest (url: string) {
+  if (url.startsWith('https://')) return https.request.bind(https)
+
+  return http.request.bind(http)
+}

apps/peertube-runner/src/shared/index.ts

@@ -0,0 +1,3 @@
+export * from './config-manager.js'
+export * from './http.js'
+export * from './logger.js'

apps/peertube-runner/src/shared/ipc/index.ts

@@ -0,0 +1,2 @@
+export * from './ipc-client.js'
+export * from './ipc-server.js'

apps/peertube-runner/src/shared/ipc/ipc-client.ts

@@ -0,0 +1,88 @@
+import CliTable3 from 'cli-table3'
+import { ensureDir } from 'fs-extra/esm'
+import { Client as NetIPC } from '@peertube/net-ipc'
+import { ConfigManager } from '../config-manager.js'
+import { IPCReponse, IPCReponseData, IPCRequest } from './shared/index.js'
+
+export class IPCClient {
+  private netIPC: NetIPC
+
+  async run () {
+    await ensureDir(ConfigManager.Instance.getSocketDirectory())
+
+    const socketPath = ConfigManager.Instance.getSocketPath()
+
+    this.netIPC = new NetIPC({ path: socketPath })
+
+    try {
+      await this.netIPC.connect()
+    } catch (err) {
+      if (err.code === 'ECONNREFUSED') {
+        throw new Error(
+          'This runner is not currently running in server mode on this system. ' +
+          'Please run it using the `server` command first (in another terminal for example) and then retry your command.'
+        )
+      }
+
+      throw err
+    }
+  }
+
+  async askRegister (options: {
+    url: string
+    registrationToken: string
+    runnerName: string
+    runnerDescription?: string
+  }) {
+    const req: IPCRequest = {
+      type: 'register',
+      ...options
+    }
+
+    const { success, error } = await this.netIPC.request(req) as IPCReponse
+
+    if (success) console.log('PeerTube instance registered')
+    else console.error('Could not register PeerTube instance on runner server side', error)
+  }
+
+  async askUnregister (options: {
+    url: string
+    runnerName: string
+  }) {
+    const req: IPCRequest = {
+      type: 'unregister',
+      ...options
+    }
+
+    const { success, error } = await this.netIPC.request(req) as IPCReponse
+
+    if (success) console.log('PeerTube instance unregistered')
+    else console.error('Could not unregister PeerTube instance on runner server side', error)
+  }
+
+  async askListRegistered () {
+    const req: IPCRequest = {
+      type: 'list-registered'
+    }
+
+    const { success, error, data } = await this.netIPC.request(req) as IPCReponse<IPCReponseData>
+    if (!success) {
+      console.error('Could not list registered PeerTube instances', error)
+      return
+    }
+
+    const table = new CliTable3({
+      head: [ 'instance', 'runner name', 'runner description' ]
+    })
+
+    for (const server of data.servers) {
+      table.push([ server.url, server.runnerName, server.runnerDescription ])
+    }
+
+    console.log(table.toString())
+  }
+
+  stop () {
+    this.netIPC.destroy()
+  }
+}

apps/peertube-runner/src/shared/ipc/ipc-server.ts

@@ -0,0 +1,61 @@
+import { ensureDir } from 'fs-extra/esm'
+import { Server as NetIPC } from '@peertube/net-ipc'
+import { pick } from '@peertube/peertube-core-utils'
+import { RunnerServer } from '../../server/index.js'
+import { ConfigManager } from '../config-manager.js'
+import { logger } from '../logger.js'
+import { IPCReponse, IPCReponseData, IPCRequest } from './shared/index.js'
+
+export class IPCServer {
+  private netIPC: NetIPC
+  private runnerServer: RunnerServer
+
+  async run (runnerServer: RunnerServer) {
+    this.runnerServer = runnerServer
+
+    await ensureDir(ConfigManager.Instance.getSocketDirectory())
+
+    const socketPath = ConfigManager.Instance.getSocketPath()
+    this.netIPC = new NetIPC({ path: socketPath })
+    await this.netIPC.start()
+
+    logger.info(`IPC socket created on ${socketPath}`)
+
+    this.netIPC.on('request', async (req: IPCRequest, res) => {
+      try {
+        const data = await this.process(req)
+
+        this.sendReponse(res, { success: true, data })
+      } catch (err) {
+        logger.error('Cannot execute RPC call', err)
+        this.sendReponse(res, { success: false, error: err.message })
+      }
+    })
+  }
+
+  private async process (req: IPCRequest) {
+    switch (req.type) {
+      case 'register':
+        await this.runnerServer.registerRunner(pick(req, [ 'url', 'registrationToken', 'runnerName', 'runnerDescription' ]))
+        return undefined
+
+      case 'unregister':
+        await this.runnerServer.unregisterRunner(pick(req, [ 'url', 'runnerName' ]))
+        return undefined
+
+      case 'list-registered':
+        return Promise.resolve(this.runnerServer.listRegistered())
+
+      default:
+        throw new Error('Unknown RPC call ' + (req as any).type)
+    }
+  }
+
+  private sendReponse <T extends IPCReponseData> (
+    response: (data: any) => Promise<void>,
+    body: IPCReponse<T>
+  ) {
+    response(body)
+      .catch(err => logger.error('Cannot send response after IPC request', err))
+  }
+}

apps/peertube-runner/src/shared/ipc/shared/index.ts

@@ -0,0 +1,2 @@
+export * from './ipc-request.model.js'
+export * from './ipc-response.model.js'

apps/peertube-runner/src/shared/ipc/shared/ipc-request.model.ts

@@ -0,0 +1,15 @@
+export type IPCRequest =
+  IPCRequestRegister |
+  IPCRequestUnregister |
+  IPCRequestListRegistered
+
+export type IPCRequestRegister = {
+  type: 'register'
+  url: string
+  registrationToken: string
+  runnerName: string
+  runnerDescription?: string
+}
+
+export type IPCRequestUnregister = { type: 'unregister', url: string, runnerName: string }
+export type IPCRequestListRegistered = { type: 'list-registered' }

apps/peertube-runner/src/shared/ipc/shared/ipc-response.model.ts

@@ -0,0 +1,15 @@
+export type IPCReponse <T extends IPCReponseData = undefined> = {
+  success: boolean
+  error?: string
+  data?: T
+}
+
+export type IPCReponseData =
+  // list registered
+  {
+    servers: {
+      runnerName: string
+      runnerDescription: string
+      url: string
+    }[]
+  }

apps/peertube-runner/src/shared/logger.ts

@@ -0,0 +1,12 @@
+import { pino } from 'pino'
+import pretty from 'pino-pretty'
+
+const logger = pino(pretty.default({
+  colorize: true
+}))
+
+logger.level = 'info'
+
+export {
+  logger
+}

apps/peertube-runner/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist",
+    "rootDir": "src",
+    "tsBuildInfoFile": "./dist/.tsbuildinfo"
+  },
+  "references": [
+    { "path": "../../packages/core-utils" },
+    { "path": "../../packages/ffmpeg" },
+    { "path": "../../packages/models" },
+    { "path": "../../packages/node-utils" },
+    { "path": "../../packages/server-commands" }
+  ]
+}

apps/peertube-runner/yarn.lock

@@ -0,0 +1,345 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@iarna/toml@^2.2.5":
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/@iarna/toml/-/toml-2.2.5.tgz#b32366c89b43c6f8cefbdefac778b9c828e3ba8c"
+  integrity sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==
+
+"@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz#44d752c1a2dc113f15f781b7cc4f53a307e3fa38"
+  integrity sha512-9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ==
+
+"@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.2.tgz#f954f34355712212a8e06c465bc06c40852c6bb3"
+  integrity sha512-lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw==
+
+"@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.2.tgz#45c63037f045c2b15c44f80f0393fa24f9655367"
+  integrity sha512-FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg==
+
+"@msgpackr-extract/msgpackr-extract-linux-arm@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.2.tgz#35707efeafe6d22b3f373caf9e8775e8920d1399"
+  integrity sha512-MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA==
+
+"@msgpackr-extract/msgpackr-extract-linux-x64@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.2.tgz#091b1218b66c341f532611477ef89e83f25fae4f"
+  integrity sha512-gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA==
+
+"@msgpackr-extract/msgpackr-extract-win32-x64@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz#0f164b726869f71da3c594171df5ebc1c4b0a407"
+  integrity sha512-O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ==
+
+"@peertube/net-ipc@^2.2.0":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@peertube/net-ipc/-/net-ipc-2.2.1.tgz#3d1c154a08b57cfea31ed760ec76fe2f69e35a19"
+  integrity sha512-RyKIGC3EeQ+xnSccf592qqsaXWrGp4wGfGl4W+wxDoZkwsThZJuiSbX8aCC1qZBHaDo3EuRH3ZrwsKpNjnyDAQ==
+  optionalDependencies:
+    fast-zlib "^2.0.1"
+    msgpackr "^1.3.2"
+
+"@types/follow-redirects@1.14.4":
+  version "1.14.4"
+  resolved "https://registry.yarnpkg.com/@types/follow-redirects/-/follow-redirects-1.14.4.tgz#ca054d72ef574c77949fc5fff278b430fcd508ec"
+  integrity sha512-GWXfsD0Jc1RWiFmMuMFCpXMzi9L7oPDVwxUnZdg89kDNnqsRfUKXEtUYtA98A6lig1WXH/CYY/fvPW9HuN5fTA==
+  dependencies:
+    "@types/node" "*"
+
+"@types/node@*":
+  version "20.11.20"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.20.tgz#f0a2aee575215149a62784210ad88b3a34843659"
+  integrity sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg==
+  dependencies:
+    undici-types "~5.26.4"
+
+abort-controller@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
+  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
+  dependencies:
+    event-target-shim "^5.0.0"
+
+atomic-sleep@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b"
+  integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==
+
+base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
+buffer@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
+  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.2.1"
+
+colorette@^2.0.7:
+  version "2.0.20"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
+  integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
+
+dateformat@^4.6.3:
+  version "4.6.3"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5"
+  integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==
+
+end-of-stream@^1.1.0:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
+env-paths@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-3.0.0.tgz#2f1e89c2f6dbd3408e1b1711dd82d62e317f58da"
+  integrity sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==
+
+event-target-shim@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
+  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
+
+events@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
+
+fast-copy@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/fast-copy/-/fast-copy-3.0.1.tgz#9e89ef498b8c04c1cd76b33b8e14271658a732aa"
+  integrity sha512-Knr7NOtK3HWRYGtHoJrjkaWepqT8thIVGAwt0p0aUs1zqkAzXZV4vo9fFNwyb5fcqK1GKYFYxldQdIDVKhUAfA==
+
+fast-redact@^3.1.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.3.0.tgz#7c83ce3a7be4898241a46560d51de10f653f7634"
+  integrity sha512-6T5V1QK1u4oF+ATxs1lWUmlEk6P2T9HqJG3e2DnHOdVgZy2rFJBoEnrIedcTXlkAHU/zKC+7KETJ+KGGKwxgMQ==
+
+fast-safe-stringify@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
+  integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==
+
+fast-zlib@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fast-zlib/-/fast-zlib-2.0.1.tgz#be624f592fc80ad8019ee2025d16a367a4e9b024"
+  integrity sha512-DCoYgNagM2Bt1VIpXpdGnRx4LzqJeYG0oh6Nf/7cWo6elTXkFGMw9CrRCYYUIapYNrozYMoyDRflx9mgT3Awyw==
+
+follow-redirects@^1.15.5:
+  version "1.15.5"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020"
+  integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==
+
+help-me@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/help-me/-/help-me-5.0.0.tgz#b1ebe63b967b74060027c2ac61f9be12d354a6f6"
+  integrity sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==
+
+ieee754@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
+joycon@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03"
+  integrity sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==
+
+minimist@^1.2.6:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
+
+msgpackr-extract@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz#e05ec1bb4453ddf020551bcd5daaf0092a2c279d"
+  integrity sha512-SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A==
+  dependencies:
+    node-gyp-build-optional-packages "5.0.7"
+  optionalDependencies:
+    "@msgpackr-extract/msgpackr-extract-darwin-arm64" "3.0.2"
+    "@msgpackr-extract/msgpackr-extract-darwin-x64" "3.0.2"
+    "@msgpackr-extract/msgpackr-extract-linux-arm" "3.0.2"
+    "@msgpackr-extract/msgpackr-extract-linux-arm64" "3.0.2"
+    "@msgpackr-extract/msgpackr-extract-linux-x64" "3.0.2"
+    "@msgpackr-extract/msgpackr-extract-win32-x64" "3.0.2"
+
+msgpackr@^1.3.2:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.10.1.tgz#51953bb4ce4f3494f0c4af3f484f01cfbb306555"
+  integrity sha512-r5VRLv9qouXuLiIBrLpl2d5ZvPt8svdQTl5/vMvE4nzDMyEX4sgW5yWhuBBj5UmgwOTWj8CIdSXn5sAfsHAWIQ==
+  optionalDependencies:
+    msgpackr-extract "^3.0.2"
+
+node-gyp-build-optional-packages@5.0.7:
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz#5d2632bbde0ab2f6e22f1bbac2199b07244ae0b3"
+  integrity sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==
+
+on-exit-leak-free@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz#fed195c9ebddb7d9e4c3842f93f281ac8dadd3b8"
+  integrity sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==
+
+once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  dependencies:
+    wrappy "1"
+
+pino-abstract-transport@^1.0.0, pino-abstract-transport@v1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-1.1.0.tgz#083d98f966262164504afb989bccd05f665937a8"
+  integrity sha512-lsleG3/2a/JIWUtf9Q5gUNErBqwIu1tUKTT3dUzaf5DySw9ra1wcqKjJjLX1VTY64Wk1eEOYsVGSaGfCK85ekA==
+  dependencies:
+    readable-stream "^4.0.0"
+    split2 "^4.0.0"
+
+pino-pretty@^10.0.0:
+  version "10.3.1"
+  resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-10.3.1.tgz#e3285a5265211ac6c7cd5988f9e65bf3371a0ca9"
+  integrity sha512-az8JbIYeN/1iLj2t0jR9DV48/LQ3RC6hZPpapKPkb84Q+yTidMCpgWxIT3N0flnBDilyBQ1luWNpOeJptjdp/g==
+  dependencies:
+    colorette "^2.0.7"
+    dateformat "^4.6.3"
+    fast-copy "^3.0.0"
+    fast-safe-stringify "^2.1.1"
+    help-me "^5.0.0"
+    joycon "^3.1.1"
+    minimist "^1.2.6"
+    on-exit-leak-free "^2.1.0"
+    pino-abstract-transport "^1.0.0"
+    pump "^3.0.0"
+    readable-stream "^4.0.0"
+    secure-json-parse "^2.4.0"
+    sonic-boom "^3.0.0"
+    strip-json-comments "^3.1.1"
+
+pino-std-serializers@^6.0.0:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-6.2.2.tgz#d9a9b5f2b9a402486a5fc4db0a737570a860aab3"
+  integrity sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA==
+
+pino@^8.11.0:
+  version "8.19.0"
+  resolved "https://registry.yarnpkg.com/pino/-/pino-8.19.0.tgz#ccc15ef736f103ec02cfbead0912bc436dc92ce4"
+  integrity sha512-oswmokxkav9bADfJ2ifrvfHUwad6MLp73Uat0IkQWY3iAw5xTRoznXbXksZs8oaOUMpmhVWD+PZogNzllWpJaA==
+  dependencies:
+    atomic-sleep "^1.0.0"
+    fast-redact "^3.1.1"
+    on-exit-leak-free "^2.1.0"
+    pino-abstract-transport v1.1.0
+    pino-std-serializers "^6.0.0"
+    process-warning "^3.0.0"
+    quick-format-unescaped "^4.0.3"
+    real-require "^0.2.0"
+    safe-stable-stringify "^2.3.1"
+    sonic-boom "^3.7.0"
+    thread-stream "^2.0.0"
+
+process-warning@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-3.0.0.tgz#96e5b88884187a1dce6f5c3166d611132058710b"
+  integrity sha512-mqn0kFRl0EoqhnL0GQ0veqFHyIN1yig9RHh/InzORTUiZHFRAur+aMtRkELNwGs9aNwKS6tg/An4NYBPGwvtzQ==
+
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+quick-format-unescaped@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz#93ef6dd8d3453cbc7970dd614fad4c5954d6b5a7"
+  integrity sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==
+
+readable-stream@^4.0.0:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.5.2.tgz#9e7fc4c45099baeed934bff6eb97ba6cf2729e09"
+  integrity sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==
+  dependencies:
+    abort-controller "^3.0.0"
+    buffer "^6.0.3"
+    events "^3.3.0"
+    process "^0.11.10"
+    string_decoder "^1.3.0"
+
+real-require@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/real-require/-/real-require-0.2.0.tgz#209632dea1810be2ae063a6ac084fee7e33fba78"
+  integrity sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==
+
+safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+safe-stable-stringify@^2.3.1:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886"
+  integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==
+
+secure-json-parse@^2.4.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/secure-json-parse/-/secure-json-parse-2.7.0.tgz#5a5f9cd6ae47df23dba3151edd06855d47e09862"
+  integrity sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==
+
+sonic-boom@^3.0.0, sonic-boom@^3.7.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-3.8.0.tgz#e442c5c23165df897d77c3c14ef3ca40dec66a66"
+  integrity sha512-ybz6OYOUjoQQCQ/i4LU8kaToD8ACtYP+Cj5qd2AO36bwbdewxWJ3ArmJ2cr6AvxlL2o0PqnCcPGUgkILbfkaCA==
+  dependencies:
+    atomic-sleep "^1.0.0"
+
+split2@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4"
+  integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==
+
+string_decoder@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+strip-json-comments@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
+thread-stream@^2.0.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/thread-stream/-/thread-stream-2.4.1.tgz#6d588b14f0546e59d3f306614f044bc01ce43351"
+  integrity sha512-d/Ex2iWd1whipbT681JmTINKw0ZwOUBZm7+Gjs64DHuX34mmw8vJL2bFAaNacaW72zYiTJxSHi5abUuOi5nsfg==
+  dependencies:
+    real-require "^0.2.0"
+
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==

client/.eslintrc.json

@@ -3,7 +3,7 @@
   "ignorePatterns": [
     "projects/**/*",
     "node_modules/",
-    "src/standalone/player/dist"
+    "src/standalone/embed-player-api/dist"
   ],
   "overrides": [
     {
@@ -14,12 +14,12 @@
         "project": [
           "tsconfig.eslint.json"
         ],
+        "EXPERIMENTAL_useSourceOfProjectReferenceRedirect": true,
         "createDefaultProgram": false
       },
       "extends": [
         "../.eslintrc.json",
-        "plugin:@angular-eslint/ng-cli-compat",
-        "plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
+        "plugin:@angular-eslint/recommended",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
@@ -155,6 +155,15 @@
         "object-shorthand": [
           "error",
           "properties"
+        ],
+        "quote-props": [
+          "error",
+          "consistent-as-needed"
+        ],
+        "no-constant-binary-expression": "error",
+        "@typescript-eslint/unbound-method": [
+          "error",
+          { "ignoreStatic": true }
         ]
       }
     },
@@ -163,7 +172,8 @@
         "*.html"
       ],
       "extends": [
-        "plugin:@angular-eslint/template/recommended"
+        "plugin:@angular-eslint/template/recommended",
+        "plugin:@angular-eslint/template/accessibility"
       ],
       "rules": {}
     }

client/.gitignore

@@ -12,5 +12,5 @@
 /e2e/local.log
 /e2e/browserstack.err
 /e2e/screenshots
-/src/standalone/player/build
-/src/standalone/player/dist
+/src/standalone/embed-player-api/build
+/src/standalone/embed-player-api/dist

client/.stylelintrc.json

@@ -2,9 +2,7 @@
   "extends": "stylelint-config-sass-guidelines",
   "rules": {
     "scss/at-import-no-partial-leading-underscore": null,
-    "color-hex-case": null,
     "color-hex-length": null,
-    "order/properties-alphabetical-order": null,
     "selector-pseudo-element-no-unknown": [
       true,
       {
@@ -20,11 +18,10 @@
     "selector-max-compound-selectors": 9,
     "selector-no-qualifying-type": null,
     "scss/at-extend-no-missing-placeholder": null,
-    "number-leading-zero": null,
     "rule-empty-line-before": null,
     "selector-max-id": null,
     "scss/at-function-pattern": null,
-    "function-parentheses-space-inside": "never-single-line",
+    "scss/load-no-partial-leading-underscore": null,
     "property-no-vendor-prefix": [
       true,
       {

client/angular.json

@@ -29,6 +29,10 @@
             "translation": "src/locale/angular.th-TH.xlf",
             "baseHref": "/client/th-TH/"
           },
+          "tr": {
+            "translation": "src/locale/angular.tr-TR.xlf",
+            "baseHref": "/client/tr-TR/"
+          },
           "fi": {
             "translation": "src/locale/angular.fi-FI.xlf",
             "baseHref": "/client/fi-FI/"
@@ -195,11 +199,14 @@
               "path-browserify",
               "deep-merge",
               "escape-string-regexp",
-              "mousetrap",
               "is-plain-object",
               "parse-srcset",
               "deepmerge",
-              "core-js/features/reflect"
+              "core-js/features/reflect",
+              "@formatjs/intl-locale/polyfill",
+              "@formatjs/intl-locale/should-polyfill",
+              "@formatjs/intl-pluralrules/polyfill-force",
+              "@formatjs/intl-pluralrules/should-polyfill"
             ],
             "scripts": [],
             "vendorChunk": true,
@@ -276,25 +283,25 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "PeerTube:build",
-            "proxyConfig": "proxy.config.json"
+            "proxyConfig": "proxy.config.json",
+            "buildTarget": "PeerTube:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "PeerTube:build:production"
+              "buildTarget": "PeerTube:build:production"
             },
             "hmr": {
-              "browserTarget": "PeerTube:build:hmr"
+              "buildTarget": "PeerTube:build:hmr"
             },
             "ar-locale": {
-              "browserTarget": "PeerTube:build:ar-locale"
+              "buildTarget": "PeerTube:build:ar-locale"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "PeerTube:build"
+            "buildTarget": "PeerTube:build"
           }
         },
         "lint": {
@@ -310,7 +317,6 @@
       }
     }
   },
-  "defaultProject": "PeerTube",
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "my",

client/e2e/src/po/admin-config.po.ts

@@ -10,14 +10,14 @@ export class AdminConfigPage {
     }
     await go('/admin/config/edit-custom#' + tab)
 
-    await $('.inner-form-title=' + waitTitles[tab]).waitForDisplayed()
+    await $('h2=' + waitTitles[tab]).waitForDisplayed()
   }
 
   async updateNSFWSetting (newValue: 'do_not_list' | 'blur' | 'display') {
     const elem = $('#instanceDefaultNSFWPolicy')
 
     await elem.waitForDisplayed()
-    await elem.scrollIntoView(false) // Avoid issues with fixed header on firefox
+    await elem.scrollIntoView({ block: 'center' }) // Avoid issues with fixed header
     await elem.waitForClickable()
 
     return elem.selectByAttribute('value', newValue)

client/e2e/src/po/login.po.ts

@@ -1,4 +1,4 @@
-import { go } from '../utils'
+import { browserSleep, go, isAndroid } from '../utils'
 
 export class LoginPage {
 
@@ -23,12 +23,20 @@ export class LoginPage {
     await $('input#username').setValue(username)
     await $('input#password').setValue(password)
 
-    await browser.pause(1000)
+    await browserSleep(1000)
 
-    await $('form input[type=submit]').click()
+    const submit = $('.login-form-and-externals > form input[type=submit]')
+    await submit.click()
+
+    // Have to do this on Android, don't really know why
+    // I think we need to "escape" from the password input, so click twice on the submit button
+    if (isAndroid()) {
+      await browserSleep(2000)
+      await submit.click()
+    }
 
     if (this.isMobileDevice) {
-      const menuToggle = $('.top-left-block span[role=button]')
+      const menuToggle = $('.top-left-block button')
 
       await $('h2=Our content selection').waitForDisplayed()
 
@@ -79,7 +87,7 @@ export class LoginPage {
     await logout.click()
 
     await browser.waitUntil(() => {
-      return $('.login-buttons-block, my-error-page a[href="/login"]').isDisplayed()
+      return $$('.login-buttons-block, my-error-page a[href="/login"]').some(e => e.isDisplayed())
     })
   }
 
@@ -94,8 +102,8 @@ export class LoginPage {
   }
 
   private getSuffix () {
-    return browser.config.baseUrl
-      ? browser.config.baseUrl.slice(-1)
+    return browser.options.baseUrl
+      ? browser.options.baseUrl.slice(-1)
       : '1'
   }
 }

client/e2e/src/po/my-account.po.ts

@@ -1,4 +1,4 @@
-import { getCheckbox, go } from '../utils'
+import { getCheckbox, go, selectCustomSelect } from '../utils'
 
 export class MyAccountPage {
 
@@ -24,7 +24,7 @@ export class MyAccountPage {
     const nsfw = $('#nsfwPolicy')
 
     await nsfw.waitForDisplayed()
-    await nsfw.scrollIntoView(false) // Avoid issues with fixed header on firefox
+    await nsfw.scrollIntoView({ block: 'center' }) // Avoid issues with fixed header
     await nsfw.waitForClickable()
 
     await nsfw.selectByAttribute('value', newValue)
@@ -36,7 +36,7 @@ export class MyAccountPage {
     const p2p = await getCheckbox('p2pEnabled')
 
     await p2p.waitForClickable()
-    await p2p.scrollIntoView(false) // Avoid issues with fixed header on firefox
+    await p2p.scrollIntoView({ block: 'center' }) // Avoid issues with fixed header
 
     await p2p.click()
 
@@ -47,7 +47,7 @@ export class MyAccountPage {
     const submit = $('my-user-video-settings input[type=submit]')
 
     await submit.waitForClickable()
-    await submit.scrollIntoView(false)
+    await submit.scrollIntoView({ block: 'center' }) // Avoid issues with fixed header
     await submit.click()
   }
 
@@ -56,7 +56,7 @@ export class MyAccountPage {
   async removeVideo (name: string) {
     const container = await this.getVideoElement(name)
 
-    await container.$('.dropdown-toggle').click()
+    await container.$('my-action-dropdown .dropdown-toggle').click()
 
     const deleteItem = () => {
       return $$('.dropdown-menu .dropdown-item').find<WebdriverIO.Element>(async v => {
@@ -117,6 +117,24 @@ export class MyAccountPage {
     return go(url)
   }
 
+  async updatePlaylistPrivacy (playlistUUID: string, privacy: 'Public' | 'Private' | 'Unlisted') {
+    go('/my-library/video-playlists/update/' + playlistUUID)
+
+    await $('a[href*="/my-library/video-playlists/update/"]').waitForDisplayed()
+
+    await selectCustomSelect('videoChannelId', 'Main root channel')
+    await selectCustomSelect('privacy', privacy)
+
+    const submit = await $('form input[type=submit]')
+    await submit.waitForClickable()
+    await submit.scrollIntoView()
+    await submit.click()
+
+    return browser.waitUntil(async () => {
+      return (await browser.getUrl()).includes('my-library/video-playlists')
+    })
+  }
+
   // My account Videos
 
   private async getVideoElement (name: string) {

client/e2e/src/po/player.po.ts

@@ -29,29 +29,40 @@ export class PlayerPage {
   }
 
   async playAndPauseVideo (isAutoplay: boolean, waitUntilSec: number) {
-    const videojsElem = () => $('div.video-js')
-
-    await videojsElem().waitForExist()
-
-    // Autoplay is disabled on iOS and Safari
-    if (isIOS() || isSafari() || isMobileDevice()) {
-      // We can't play the video if it is not muted
-      await browser.execute(`document.querySelector('video').muted = true`)
-      await this.clickOnPlayButton()
-    } else if (isAutoplay === false) {
-      await this.clickOnPlayButton()
+    // Autoplay is disabled on mobile and Safari
+    if (isIOS() || isSafari() || isMobileDevice() || isAutoplay === false) {
+      await this.playVideo()
     }
 
+    await $('div.video-js.vjs-has-started').waitForExist()
+
     await browserSleep(2000)
 
     await browser.waitUntil(async () => {
       return (await this.getWatchVideoPlayerCurrentTime()) >= waitUntilSec
-    })
+    }, { timeout: Math.max(waitUntilSec * 2 * 1000, 30000) })
 
-    await videojsElem().click()
+    // Pause video
+    await $('div.video-js').click()
   }
 
   async playVideo () {
+    await $('div.video-js.vjs-paused, div.video-js.vjs-playing').waitForExist()
+
+    if (await $('div.video-js.vjs-playing').isExisting()) {
+      if (!isIOS()) return
+
+      // On iOS, the web browser may have aborted player autoplay, so check the video is still autoplayed
+      await browserSleep(5000)
+      if (await $('div.video-js.vjs-playing').isExisting()) return
+    }
+
+    // Autoplay is disabled on iOS and Safari
+    if (isIOS() || isSafari() || isMobileDevice()) {
+      // We can't play the video if it is not muted
+      await browser.execute(`document.querySelector('video').muted = true`)
+    }
+
     return this.clickOnPlayButton()
   }
 
@@ -61,4 +72,15 @@ export class PlayerPage {
     await playButton().waitForClickable()
     await playButton().click()
   }
+
+  async fillEmbedVideoPassword (videoPassword: string) {
+    const videoPasswordInput = $('input#video-password-input')
+    const confirmButton = await $('button#video-password-submit')
+
+    await videoPasswordInput.clearValue()
+    await videoPasswordInput.setValue(videoPassword)
+    await confirmButton.waitForClickable()
+
+    return confirmButton.click()
+  }
 }

client/e2e/src/po/signup.po.ts

@@ -50,7 +50,7 @@ export class SignupPage {
     await $('#password').setValue(options.password || 'password')
 
     // Fix weird bug on firefox that "cannot scroll into view" when using just `setValue`
-    await $('#email').scrollIntoView(false)
+    await $('#email').scrollIntoView({ block: 'center' })
     await $('#email').waitForClickable()
     await $('#email').setValue(options.email || `${options.username}@example.com`)
   }
@@ -62,4 +62,26 @@ export class SignupPage {
     await $('#displayName').setValue(options.displayName || `${options.name} channel display name`)
     await $('#name').setValue(options.name)
   }
+
+  async fullSignup ({ accountInfo, channelInfo }: {
+    accountInfo: {
+      username: string
+      password?: string
+      displayName?: string
+      email?: string
+    }
+    channelInfo: {
+      name: string
+    }
+  }) {
+    await this.clickOnRegisterInMenu()
+    await this.validateStep()
+    await this.checkTerms()
+    await this.validateStep()
+    await this.fillAccountStep(accountInfo)
+    await this.validateStep()
+    await this.fillChannelStep(channelInfo)
+    await this.validateStep()
+    await this.getEndMessage()
+  }
 }

client/e2e/src/po/video-list.po.ts

@@ -67,7 +67,7 @@ export class VideoListPage {
 
   async getVideosListName () {
     const elems = await $$('.videos .video-miniature .video-miniature-name')
-    const texts = await Promise.all(elems.map(e => e.getText()))
+    const texts = await elems.map(e => e.getText())
 
     return texts.map(t => t.trim())
   }

client/e2e/src/po/video-search.po.ts

@@ -2,7 +2,7 @@ export class VideoSearchPage {
 
   async search (search: string) {
     await $('#search-video').setValue(search)
-    await $('my-header .icon-search').click()
+    await $('.search-button').click()
 
     await browser.waitUntil(() => {
       return $('my-video-miniature').isDisplayed()

client/e2e/src/po/video-upload.po.ts

@@ -64,6 +64,16 @@ export class VideoUploadPage {
     return selectCustomSelect('privacy', 'Private')
   }
 
+  async setAsPasswordProtected (videoPassword: string) {
+    selectCustomSelect('privacy', 'Password protected')
+
+    const videoPasswordInput = $('input#videoPassword')
+    await videoPasswordInput.waitForClickable()
+    await videoPasswordInput.clearValue()
+
+    return videoPasswordInput.setValue(videoPassword)
+  }
+
   private getSecondStepSubmitButton () {
     return $('.submit-container my-button')
   }

client/e2e/src/po/video-watch.po.ts

@@ -9,11 +9,15 @@ export class VideoWatchPage {
   waitWatchVideoName (videoName: string) {
     if (this.isSafari) return browserSleep(5000)
 
-    // On mobile we display the first node, on desktop the second
+    // On mobile we display the first node, on desktop the second one
     const index = this.isMobileDevice ? 0 : 1
 
     return browser.waitUntil(async () => {
-      return (await $$('.video-info .video-info-name')[index].getText()).includes(videoName)
+      if (!await $('.video-info .video-info-name').isExisting()) return false
+
+      const elem = await $$('.video-info .video-info-name')[index]
+
+      return (await elem.getText()).includes(videoName) && elem.isDisplayed()
     })
   }
 
@@ -30,9 +34,13 @@ export class VideoWatchPage {
   }
 
   async isDownloadEnabled () {
-    await this.clickOnMoreDropdownIcon()
+    try {
+      await this.clickOnMoreDropdownIcon()
 
-    return $('.dropdown-item .icon-download').isExisting()
+      return await $('.dropdown-item .icon-download').isExisting()
+    } catch {
+      return $('.action-button-download').isDisplayed()
+    }
   }
 
   areCommentsEnabled () {
@@ -43,19 +51,25 @@ export class VideoWatchPage {
     return $('my-privacy-concerns').isDisplayed()
   }
 
-  async goOnAssociatedEmbed () {
+  async goOnAssociatedEmbed (passwordProtected = false) {
     let url = await browser.getUrl()
     url = url.replace('/w/', '/videos/embed/')
     url = url.replace(':3333', ':9001')
 
     await go(url)
-    await this.waitEmbedForDisplayed()
+
+    if (passwordProtected) await this.waitEmbedForVideoPasswordForm()
+    else await this.waitEmbedForDisplayed()
   }
 
   waitEmbedForDisplayed () {
     return $('.vjs-big-play-button').waitForDisplayed()
   }
 
+  waitEmbedForVideoPasswordForm () {
+    return $('#video-password-input').waitForDisplayed()
+  }
+
   isEmbedWarningDisplayed () {
     return $('.peertube-dock-description').isDisplayed()
   }
@@ -138,4 +152,78 @@ export class VideoWatchPage {
 
     return elem()
   }
+
+  isPasswordProtected () {
+    return $('#confirmInput').isExisting()
+  }
+
+  async fillVideoPassword (videoPassword: string) {
+    const videoPasswordInput = await $('input#confirmInput')
+    await videoPasswordInput.waitForClickable()
+    await videoPasswordInput.clearValue()
+    await videoPasswordInput.setValue(videoPassword)
+
+    const confirmButton = await $('input[value="Confirm"]')
+    await confirmButton.waitForClickable()
+    return confirmButton.click()
+  }
+
+  async like () {
+    const likeButton = await $('.action-button-like')
+    const isActivated = (await likeButton.getAttribute('class')).includes('activated')
+
+    let count: number
+    try {
+      count = parseInt(await $('.action-button-like > .count').getText())
+    } catch (error) {
+      count = 0
+    }
+
+    await likeButton.waitForClickable()
+    await likeButton.click()
+
+    if (isActivated) {
+      if (count === 1) {
+        return expect(!await $('.action-button-like > .count').isExisting())
+      } else {
+        return expect(parseInt(await $('.action-button-like > .count').getText())).toBe(count - 1)
+      }
+    } else {
+      return expect(parseInt(await $('.action-button-like > .count').getText())).toBe(count + 1)
+    }
+  }
+
+  async createThread (comment: string) {
+    const textarea = await $('my-video-comment-add textarea')
+    await textarea.waitForClickable()
+
+    await textarea.setValue(comment)
+
+    const confirmButton = await $('.comment-buttons .orange-button')
+    await confirmButton.waitForClickable()
+    await confirmButton.click()
+
+    const createdComment = await (await $('.comment-html p')).getText()
+
+    return expect(createdComment).toBe(comment)
+  }
+
+  async createReply (comment: string) {
+    const replyButton = await $('button.comment-action-reply')
+    await replyButton.waitForClickable()
+    await replyButton.scrollIntoView()
+    await replyButton.click()
+
+    const textarea = await $('my-video-comment my-video-comment-add textarea')
+    await textarea.waitForClickable()
+    await textarea.setValue(comment)
+
+    const confirmButton = await $('my-video-comment .comment-buttons .orange-button')
+    await confirmButton.waitForClickable()
+    await confirmButton.click()
+
+    const createdComment = await (await $('.is-child .comment-html p')).getText()
+
+    return expect(createdComment).toBe(comment)
+  }
 }

client/e2e/src/suites-all/private-videos.e2e-spec.ts

@@ -31,8 +31,8 @@ describe('Private videos all workflow', () => {
     return loginPage.loginOnPeerTube2()
   })
 
-  it('Should play an internal webtorrent video', async () => {
-    await go(FIXTURE_URLS.INTERNAL_WEBTORRENT_VIDEO)
+  it('Should play an internal web video', async () => {
+    await go(FIXTURE_URLS.INTERNAL_WEB_VIDEO)
 
     await videoWatchPage.waitWatchVideoName(internalVideoName)
     await checkCorrectlyPlay(playerPage)
@@ -52,8 +52,8 @@ describe('Private videos all workflow', () => {
     await checkCorrectlyPlay(playerPage)
   })
 
-  it('Should play an internal WebTorrent video in embed', async () => {
-    await go(FIXTURE_URLS.INTERNAL_EMBED_WEBTORRENT_VIDEO)
+  it('Should play an internal Web Video in embed', async () => {
+    await go(FIXTURE_URLS.INTERNAL_EMBED_WEB_VIDEO)
 
     await videoWatchPage.waitEmbedForDisplayed()
     await checkCorrectlyPlay(playerPage)

client/e2e/src/suites-all/videos.e2e-spec.ts

@@ -89,7 +89,7 @@ describe('Videos all workflow', () => {
     let videoNameToExcept = videoName
 
     if (isMobileDevice() || isSafari()) {
-      await go(FIXTURE_URLS.WEBTORRENT_VIDEO)
+      await go(FIXTURE_URLS.WEB_VIDEO)
       videoNameToExcept = 'E2E tests'
     } else {
       await videoListPage.clickOnVideo(videoName)
@@ -176,7 +176,7 @@ describe('Videos all workflow', () => {
     await videoWatchPage.waitUntilVideoName(video2Name, 40 * 1000)
   })
 
-  it('Should watch the webtorrent playlist in the embed', async () => {
+  it('Should watch the Web Video playlist in the embed', async () => {
     if (isUploadUnsupported()) return
 
     const accessToken = await browser.execute(`return window.localStorage.getItem('access_token');`)

client/e2e/src/suites-local/custom-server-defaults.e2e-spec.ts

@@ -1,7 +1,7 @@
 import { LoginPage } from '../po/login.po'
 import { VideoUploadPage } from '../po/video-upload.po'
 import { VideoWatchPage } from '../po/video-watch.po'
-import { go, isMobileDevice, isSafari, waitServerUp } from '../utils'
+import { getScreenshotPath, go, isMobileDevice, isSafari, waitServerUp } from '../utils'
 
 describe('Custom server defaults', () => {
   let videoUploadPage: VideoUploadPage
@@ -30,14 +30,21 @@ describe('Custom server defaults', () => {
 
       await videoWatchPage.waitWatchVideoName('video')
 
-      expect(await videoWatchPage.getPrivacy()).toBe('Internal')
-      expect(await videoWatchPage.getLicence()).toBe('Attribution - Non Commercial')
-      expect(await videoWatchPage.isDownloadEnabled()).toBeFalsy()
-      expect(await videoWatchPage.areCommentsEnabled()).toBeFalsy()
-    })
+      const videoUrl = await browser.getUrl()
 
-    after(async function () {
+      expect(await videoWatchPage.getPrivacy()).toBe('Unlisted')
+      expect(await videoWatchPage.getLicence()).toBe('Attribution - Non Commercial')
+      expect(await videoWatchPage.areCommentsEnabled()).toBeFalsy()
+
+      // Owners can download their videos
+      expect(await videoWatchPage.isDownloadEnabled()).toBeTruthy()
+
+      // Logout to see if the download enabled is correct for anonymous users
       await loginPage.logout()
+      await browser.url(videoUrl)
+      await videoWatchPage.waitWatchVideoName('video')
+
+      expect(await videoWatchPage.isDownloadEnabled()).toBeFalsy()
     })
   })
 
@@ -83,4 +90,8 @@ describe('Custom server defaults', () => {
       await checkP2P(false)
     })
   })
+
+  after(async () => {
+    await browser.saveScreenshot(getScreenshotPath('after-test.png'))
+  })
 })

client/e2e/src/suites-local/signup.e2e-spec.ts

@@ -35,7 +35,7 @@ function checkEndMessage (options: {
   }
 
   {
-    const checkEmail = 'Check your emails'
+    const checkEmail = 'Check your email'
 
     if (requiresEmailVerification) {
       expect(message).toContain(checkEmail)
@@ -243,8 +243,10 @@ describe('Signup', () => {
     let emailPort: number
 
     before(async () => {
+      const key = browser.options.baseUrl + '-emailPort'
       // FIXME: typings are wrong, get returns a promise
-      emailPort = await (browser.sharedStore.get(browser.config.baseUrl + '-emailPort') as unknown as Promise<number>)
+      // FIXME: use * because the key is not properly escaped by the shared store when using get(key)
+      emailPort = (await (browser.sharedStore.get('*') as unknown as Promise<number>))[key]
 
       await MockSMTPServer.Instance.collectEmails(emailPort, emails)
     })

client/e2e/src/suites-local/video-password.e2e-spec.ts

@@ -0,0 +1,231 @@
+import { LoginPage } from '../po/login.po'
+import { SignupPage } from '../po/signup.po'
+import { PlayerPage } from '../po/player.po'
+import { VideoUploadPage } from '../po/video-upload.po'
+import { VideoWatchPage } from '../po/video-watch.po'
+import { getScreenshotPath, go, isMobileDevice, isSafari, waitServerUp } from '../utils'
+import { MyAccountPage } from '../po/my-account.po'
+
+describe('Password protected videos', () => {
+  let videoUploadPage: VideoUploadPage
+  let loginPage: LoginPage
+  let videoWatchPage: VideoWatchPage
+  let signupPage: SignupPage
+  let playerPage: PlayerPage
+  let myAccountPage: MyAccountPage
+  let passwordProtectedVideoUrl: string
+  let playlistUrl: string
+
+  const seed = Math.random()
+  const passwordProtectedVideoName = seed + ' - password protected'
+  const publicVideoName1 = seed + ' - public 1'
+  const publicVideoName2 = seed + ' - public 2'
+  const videoPassword = 'password'
+  const regularUsername = 'user_1'
+  const regularUserPassword = 'user password'
+  const playlistName = seed + ' - playlist'
+
+  function testRateAndComment () {
+    it('Should add and remove like on video', async function () {
+      await videoWatchPage.like()
+      await videoWatchPage.like()
+    })
+
+    it('Should create thread on video', async function () {
+      await videoWatchPage.createThread('My first comment')
+    })
+
+    it('Should reply to thread on video', async function () {
+      await videoWatchPage.createReply('My first reply')
+    })
+  }
+
+  before(async () => {
+    await waitServerUp()
+
+    loginPage = new LoginPage(isMobileDevice())
+    videoUploadPage = new VideoUploadPage()
+    videoWatchPage = new VideoWatchPage(isMobileDevice(), isSafari())
+    signupPage = new SignupPage()
+    playerPage = new PlayerPage()
+    myAccountPage = new MyAccountPage()
+
+    await browser.maximizeWindow()
+  })
+
+  describe('Owner', function () {
+    before(async () => {
+      await loginPage.loginAsRootUser()
+    })
+
+    it('Should login, upload a public video and save it to a playlist', async () => {
+      await videoUploadPage.navigateTo()
+      await videoUploadPage.uploadVideo('video.mp4')
+      await videoUploadPage.validSecondUploadStep(publicVideoName1)
+
+      await videoWatchPage.clickOnSave()
+
+      await videoWatchPage.createPlaylist(playlistName)
+
+      await videoWatchPage.saveToPlaylist(playlistName)
+      await browser.pause(5000)
+
+    })
+
+    it('Should upload a password protected video', async () => {
+      await videoUploadPage.navigateTo()
+      await videoUploadPage.uploadVideo('video2.mp4')
+      await videoUploadPage.setAsPasswordProtected(videoPassword)
+      await videoUploadPage.validSecondUploadStep(passwordProtectedVideoName)
+
+      await videoWatchPage.waitWatchVideoName(passwordProtectedVideoName)
+
+      passwordProtectedVideoUrl = await browser.getUrl()
+    })
+
+    it('Should save to playlist the password protected video', async () => {
+      await videoWatchPage.clickOnSave()
+      await videoWatchPage.saveToPlaylist(playlistName)
+    })
+
+    it('Should upload a second public video and save it to playlist', async () => {
+      await videoUploadPage.navigateTo()
+
+      await videoUploadPage.uploadVideo('video3.mp4')
+      await videoUploadPage.validSecondUploadStep(publicVideoName2)
+
+      await videoWatchPage.clickOnSave()
+      await videoWatchPage.saveToPlaylist(playlistName)
+    })
+
+    it('Should play video without password', async function () {
+      await go(passwordProtectedVideoUrl)
+
+      expect(!await videoWatchPage.isPasswordProtected())
+
+      await videoWatchPage.waitWatchVideoName(passwordProtectedVideoName)
+
+      expect(await videoWatchPage.getPrivacy()).toBe('Password protected')
+      await playerPage.playAndPauseVideo(false, 2)
+    })
+
+    testRateAndComment()
+
+    it('Should play video on embed without password', async function () {
+      await videoWatchPage.goOnAssociatedEmbed()
+      await playerPage.playAndPauseVideo(false, 2)
+    })
+
+    it('Should have the playlist in my account', async function () {
+      await go('/')
+      await myAccountPage.navigateToMyPlaylists()
+      const videosNumberText = await myAccountPage.getPlaylistVideosText(playlistName)
+
+      expect(videosNumberText).toEqual('3 videos')
+      await myAccountPage.clickOnPlaylist(playlistName)
+
+      const count = await myAccountPage.countTotalPlaylistElements()
+      expect(count).toEqual(3)
+    })
+
+    it('Should update the playlist to public', async () => {
+      const url = await browser.getUrl()
+      const regex = /\/my-library\/video-playlists\/([^/]+)/i
+      const match = url.match(regex)
+      const uuid = match ? match[1] : null
+
+      expect(uuid).not.toBeNull()
+
+      await myAccountPage.updatePlaylistPrivacy(uuid, 'Public')
+    })
+
+    it('Should watch the playlist', async () => {
+      await myAccountPage.clickOnPlaylist(playlistName)
+      await myAccountPage.playPlaylist()
+      playlistUrl = await browser.getUrl()
+
+      await videoWatchPage.waitUntilVideoName(publicVideoName1, 40 * 1000)
+      await videoWatchPage.waitUntilVideoName(passwordProtectedVideoName, 40 * 1000)
+      await videoWatchPage.waitUntilVideoName(publicVideoName2, 40 * 1000)
+    })
+
+    after(async () => {
+      await loginPage.logout()
+    })
+  })
+
+  describe('Regular users', function () {
+
+    before(async () => {
+      await signupPage.fullSignup({
+        accountInfo: {
+          username: regularUsername,
+          password: regularUserPassword
+        },
+        channelInfo: {
+          name: 'user_1_channel'
+        }
+      })
+    })
+
+    it('Should requires password to play video', async function () {
+      await go(passwordProtectedVideoUrl)
+
+      expect(await videoWatchPage.isPasswordProtected())
+
+      await videoWatchPage.fillVideoPassword(videoPassword)
+      await videoWatchPage.waitWatchVideoName(passwordProtectedVideoName)
+
+      expect(await videoWatchPage.getPrivacy()).toBe('Password protected')
+      await playerPage.playAndPauseVideo(true, 2)
+    })
+
+    testRateAndComment()
+
+    it('Should requires password to play video on embed', async function () {
+      await videoWatchPage.goOnAssociatedEmbed(true)
+      await playerPage.fillEmbedVideoPassword(videoPassword)
+      await playerPage.playAndPauseVideo(false, 2)
+    })
+
+    it('Should watch the playlist without password protected video', async () => {
+      await go(playlistUrl)
+      await playerPage.playVideo()
+      await videoWatchPage.waitUntilVideoName(publicVideoName2, 40 * 1000)
+    })
+
+    after(async () => {
+      await loginPage.logout()
+    })
+  })
+
+  describe('Anonymous users', function () {
+    it('Should requires password to play video', async function () {
+      await go(passwordProtectedVideoUrl)
+
+      expect(await videoWatchPage.isPasswordProtected())
+
+      await videoWatchPage.fillVideoPassword(videoPassword)
+      await videoWatchPage.waitWatchVideoName(passwordProtectedVideoName)
+
+      expect(await videoWatchPage.getPrivacy()).toBe('Password protected')
+      await playerPage.playAndPauseVideo(true, 2)
+    })
+
+    it('Should requires password to play video on embed', async function () {
+      await videoWatchPage.goOnAssociatedEmbed(true)
+      await playerPage.fillEmbedVideoPassword(videoPassword)
+      await playerPage.playAndPauseVideo(false, 2)
+    })
+
+    it('Should watch the playlist without password protected video', async () => {
+      await go(playlistUrl)
+      await playerPage.playVideo()
+      await videoWatchPage.waitUntilVideoName(publicVideoName2, 40 * 1000)
+    })
+  })
+
+  after(async () => {
+    await browser.saveScreenshot(getScreenshotPath('after-test.png'))
+  })
+})

client/e2e/src/suites-local/videos-list.e2e-spec.ts

@@ -51,15 +51,15 @@ describe('Videos list', () => {
 
   async function checkCommonVideoListPages (policy: NSFWPolicy) {
     const promisesWithFilters = [
-      videoListPage.goOnRootAccount,
-      videoListPage.goOnLocal,
-      videoListPage.goOnRecentlyAdded,
-      videoListPage.goOnTrending,
-      videoListPage.goOnRootChannel
+      videoListPage.goOnRootAccount.bind(videoListPage),
+      videoListPage.goOnLocal.bind(videoListPage),
+      videoListPage.goOnRecentlyAdded.bind(videoListPage),
+      videoListPage.goOnTrending.bind(videoListPage),
+      videoListPage.goOnRootChannel.bind(videoListPage)
     ]
 
     for (const p of promisesWithFilters) {
-      await p.call(videoListPage)
+      await p()
 
       const filter = await videoListPage.getNSFWFilter()
       const filterText = await filter.getText()
@@ -69,11 +69,11 @@ describe('Videos list', () => {
     }
 
     const promisesWithoutFilters = [
-      videoListPage.goOnRootAccountChannels,
-      videoListPage.goOnHomepage
+      videoListPage.goOnRootAccountChannels.bind(videoListPage),
+      videoListPage.goOnHomepage.bind(videoListPage)
     ]
     for (const p of promisesWithoutFilters) {
-      await p.call(videoListPage)
+      await p()
 
       await checkNormalVideo()
       await checkNSFWVideo(policy)

client/e2e/src/utils/common.ts

@@ -8,6 +8,12 @@ function isMobileDevice () {
   return platformName === 'android' || platformName === 'ios'
 }
 
+function isAndroid () {
+  const platformName = (browser.capabilities['platformName'] || '').toLowerCase()
+
+  return platformName === 'android'
+}
+
 function isSafari () {
   return browser.capabilities['browserName'] &&
          browser.capabilities['browserName'].toLowerCase() === 'safari'
@@ -20,7 +26,6 @@ function isIOS () {
 async function go (url: string) {
   await browser.url(url)
 
-  // Hide notifications that could fail tests when hiding buttons
   await browser.execute(() => {
     const style = document.createElement('style')
     style.innerHTML = 'p-toast { display: none }'
@@ -41,6 +46,7 @@ export {
   isMobileDevice,
   isSafari,
   isIOS,
+  isAndroid,
   waitServerUp,
   go,
   browserSleep

client/e2e/src/utils/hooks.ts

@@ -66,7 +66,7 @@ function buildConfig (suiteFile: string = undefined) {
         publish: {
           download_enabled: false,
           comments_enabled: false,
-          privacy: 4,
+          privacy: 2,
           licence: 4
         },
         p2p: {
@@ -93,5 +93,14 @@ function buildConfig (suiteFile: string = undefined) {
     }
   }
 
+  if (filename === 'video-password.e2e-spec.ts') {
+    return {
+      signup: {
+        enabled: true,
+        limit: -1
+      }
+    }
+  }
+
   return {}
 }

client/e2e/src/utils/mock-smtp.ts

@@ -24,8 +24,6 @@ class MockSMTPServer {
 
       this.maildev.on('new', email => {
         this.emails.push(email)
-
-        console.log('pushed email', email)
       })
 
       this.maildev.listen(err => {

client/e2e/src/utils/server.ts

@@ -3,6 +3,8 @@ import { join, resolve } from 'path'
 
 function runServer (appInstance: number, config: any = {}) {
   const env = Object.create(process.env)
+
+  env['NODE_OPTIONS'] = ''
   env['NODE_ENV'] = 'test'
   env['NODE_APP_INSTANCE'] = appInstance + ''
 
@@ -43,7 +45,10 @@ function runServer (appInstance: number, config: any = {}) {
 
 function runCommand (command: string) {
   return new Promise<void>((res, rej) => {
-    const p = exec(command, { cwd: getRootCWD() })
+    // Reset NODE_OPTIONS env set by webdriverio
+    const env = { ...process.env, NODE_OPTIONS: '' }
+
+    const p = exec(command, { env, cwd: getRootCWD() })
 
     p.stderr.on('data', data => console.error(data.toString()))
     p.on('error', err => rej(err))

client/e2e/src/utils/urls.ts

@@ -1,14 +1,14 @@
 const FIXTURE_URLS = {
-  INTERNAL_WEBTORRENT_VIDEO: 'https://peertube2.cpy.re/w/pwfz7NizSdPD4mJcbbmNwa?mode=webtorrent&start=0',
+  INTERNAL_WEB_VIDEO: 'https://peertube2.cpy.re/w/pwfz7NizSdPD4mJcbbmNwa?mode=web-video&start=0',
   INTERNAL_HLS_VIDEO: 'https://peertube2.cpy.re/w/pwfz7NizSdPD4mJcbbmNwa?start=0',
 
-  INTERNAL_EMBED_WEBTORRENT_VIDEO: 'https://peertube2.cpy.re/videos/embed/pwfz7NizSdPD4mJcbbmNwa?mode=webtorrent&start=0',
+  INTERNAL_EMBED_WEB_VIDEO: 'https://peertube2.cpy.re/videos/embed/pwfz7NizSdPD4mJcbbmNwa?mode=web-video&start=0',
   INTERNAL_EMBED_HLS_VIDEO: 'https://peertube2.cpy.re/videos/embed/pwfz7NizSdPD4mJcbbmNwa?start=0',
 
   INTERNAL_HLS_ONLY_VIDEO: 'https://peertube2.cpy.re/w/tKQmHcqdYZRdCszLUiWM3V?start=0',
   INTERNAL_EMBED_HLS_ONLY_VIDEO: 'https://peertube2.cpy.re/videos/embed/tKQmHcqdYZRdCszLUiWM3V?start=0',
 
-  WEBTORRENT_VIDEO: 'https://peertube2.cpy.re/w/122d093a-1ede-43bd-bd34-59d2931ffc5e',
+  WEB_VIDEO: 'https://peertube2.cpy.re/w/122d093a-1ede-43bd-bd34-59d2931ffc5e',
 
   HLS_EMBED: 'https://peertube2.cpy.re/videos/embed/969bf103-7818-43b5-94a0-de159e13de50',
   HLS_PLAYLIST_EMBED: 'https://peertube2.cpy.re/video-playlists/embed/73804a40-da9a-40c2-b1eb-2c6d9eec8f0a',

client/e2e/tsconfig.json

@@ -6,9 +6,13 @@
     "esModuleInterop": true,
     "module": "commonjs",
     "target": "es5",
+    "typeRoots": [
+      "../node_modules/@types",
+      "../node_modules"
+    ],
     "types": [
       "node",
-      "webdriverio/async",
+      "@wdio/globals/types",
       "@wdio/mocha-framework",
       "expect-webdriverio"
     ]

client/e2e/wdio.browserstack.conf.ts

@@ -10,25 +10,39 @@ if (!key) throw new Error('Miss browser stack key')
 function buildMainOptions (sessionName: string) {
   return {
     projectName: 'PeerTube',
-    buildName: 'Main E2E - ' + new Date().toISOString().split('T')[0],
+    buildName: 'Main E2E - ' + new Date().toISOString(),
     sessionName,
     consoleLogs: 'info',
     networkLogs: true
   }
 }
 
-function buildBStackDesktopOptions (sessionName: string, resolution: string, os?: string) {
+function buildBStackDesktopOptions (options: {
+  sessionName: string
+  resolution: string
+  os?: string
+  osVersion?: string
+}) {
+  const { sessionName, resolution, os, osVersion } = options
+
   return {
     'bstack:options': {
       ...buildMainOptions(sessionName),
 
       os,
+      osVersion,
       resolution
     }
   }
 }
 
-function buildBStackMobileOptions (sessionName: string, deviceName: string, osVersion: string) {
+function buildBStackMobileOptions (options: {
+  sessionName: string
+  deviceName: string
+  osVersion: string
+}) {
+  const { sessionName, deviceName, osVersion } = options
+
   return {
     'bstack:options': {
       ...buildMainOptions(sessionName),
@@ -53,45 +67,45 @@ module.exports = {
       {
         browserName: 'Chrome',
 
-        ...buildBStackDesktopOptions('Latest Chrome Desktop', '1280x1024')
+        ...buildBStackDesktopOptions({ sessionName: 'Latest Chrome Desktop', resolution: '1280x1024', os: 'Windows', osVersion: '8' })
       },
       {
         browserName: 'Firefox',
         browserVersion: '78', // Very old ESR
 
-        ...buildBStackDesktopOptions('Firefox ESR Desktop', '1280x1024', 'Windows')
+        ...buildBStackDesktopOptions({ sessionName: 'Firefox ESR Desktop', resolution: '1280x1024', os: 'Windows', osVersion: '8' })
       },
       {
         browserName: 'Safari',
         browserVersion: '12.1',
 
-        ...buildBStackDesktopOptions('Safari Desktop', '1280x1024')
+        ...buildBStackDesktopOptions({ sessionName: 'Safari Desktop', resolution: '1280x1024' })
       },
       {
         browserName: 'Firefox',
 
-        ...buildBStackDesktopOptions('Firefox Latest', '1280x1024')
+        ...buildBStackDesktopOptions({ sessionName: 'Firefox Latest', resolution: '1280x1024', os: 'Windows', osVersion: '8' })
       },
       {
         browserName: 'Edge',
 
-        ...buildBStackDesktopOptions('Edge Latest', '1280x1024')
+        ...buildBStackDesktopOptions({ sessionName: 'Edge Latest', resolution: '1280x1024' })
       },
 
       {
         browserName: 'Chrome',
 
-        ...buildBStackMobileOptions('Latest Chrome Android', 'Samsung Galaxy S8', '7.0')
+        ...buildBStackMobileOptions({ sessionName: 'Latest Chrome Android', deviceName: 'Samsung Galaxy S8', osVersion: '7.0' })
       },
       {
         browserName: 'Safari',
 
-        ...buildBStackMobileOptions('Safari iPhone', 'iPhone 8 Plus', '12.4')
+        ...buildBStackMobileOptions({ sessionName: 'Safari iPhone', deviceName: 'iPhone 8', osVersion: '13' })
       },
       {
         browserName: 'Safari',
 
-        ...buildBStackMobileOptions('Safari iPad', 'iPad 7th', '13')
+        ...buildBStackMobileOptions({ sessionName: 'Safari iPad', deviceName: 'iPad 7th', osVersion: '13' })
       }
     ],
 

client/e2e/wdio.local-test.conf.ts

@@ -25,15 +25,15 @@ module.exports = {
 
     capabilities: [
       {
-        browserName: 'chrome',
-        acceptInsecureCerts: true,
+        'browserName': 'chrome',
+        'acceptInsecureCerts': true,
         'goog:chromeOptions': {
-          args: [ '--disable-gpu', windowSizeArg ],
+          args: [ '--headless', '--disable-gpu', windowSizeArg ],
           prefs
         }
       },
       {
-        browserName: 'firefox',
+        'browserName': 'firefox',
         'moz:firefoxOptions': {
           binary: '/usr/bin/firefox-developer-edition',
           args: [ '--headless', windowSizeArg ],
@@ -43,7 +43,7 @@ module.exports = {
       }
     ],
 
-    services: [ 'chromedriver', 'geckodriver', 'shared-store' ],
+    services: [ 'shared-store' ],
 
     beforeSession: beforeLocalSession,
     beforeSuite: beforeLocalSuite,

client/e2e/wdio.local.conf.ts

@@ -20,14 +20,15 @@ module.exports = {
 
     capabilities: [
       {
-        browserName: 'chrome',
+        'browserName': 'chrome',
         'goog:chromeOptions': {
+          binary: '/usr/bin/google-chrome-stable',
           args: [ '--headless', '--disable-gpu', windowSizeArg ],
           prefs
         }
       },
       {
-        browserName: 'firefox',
+        'browserName': 'firefox',
         'moz:firefoxOptions': {
           binary: '/usr/bin/firefox-developer-edition',
           args: [ '--headless', windowSizeArg ],
@@ -37,7 +38,7 @@ module.exports = {
       }
     ],
 
-    services: [ 'chromedriver', 'geckodriver', 'shared-store' ],
+    services: [ 'shared-store' ],
 
     beforeSession: beforeLocalSession,
     beforeSuite: beforeLocalSuite,

client/e2e/wdio.main.conf.ts

@@ -59,7 +59,7 @@ export const config = {
   // with `/`, the base url gets prepended, not including the path portion of your baseUrl.
   // If your `url` parameter starts without a scheme or `/` (like `some/path`), the base url
   // gets prepended directly.
-  baseUrl: 'http://localhost:9001',
+  baseUrl: 'http://127.0.0.1:9001',
   //
   // Default timeout for all waitFor* commands.
   waitforTimeout: 5000,
@@ -80,7 +80,7 @@ export const config = {
   framework: 'mocha',
   //
   // The number of times to retry the entire specfile when it fails as a whole
-  specFileRetries: 1,
+  specFileRetries: 2,
   //
   // Delay in seconds between the spec file retry attempts
   // specFileRetriesDelay: 0,
@@ -107,19 +107,10 @@ export const config = {
 
     tsNodeOpts: {
       project: require('path').join(__dirname, './tsconfig.json')
-    },
-
-    tsConfigPathsOpts: {
-      baseUrl: './',
-      paths: {
-        '@server/*': [ '../../server/*' ],
-        '@shared/*': [ '../../shared/*' ]
-      }
     }
   },
 
   before: function () {
-    require('expect-webdriverio')
     require('./src/commands/upload')
   }
 } as Partial<WebdriverIO.Config>

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "peertube-client",
-  "version": "5.1.0",
+  "version": "6.1.0",
   "private": true,
   "license": "AGPL-3.0",
   "author": {
@@ -14,7 +14,7 @@
   },
   "scripts": {
     "lint": "npm run lint-ts && npm run lint-scss",
-    "lint-ts": "eslint --ext .ts src/standalone/**/*.ts && npm run ng lint",
+    "lint-ts": "eslint --cache --ext .ts src/standalone/**/*.ts && npm run ng lint",
     "lint-scss": "stylelint 'src/**/*.scss'",
     "webpack": "webpack",
     "eslint": "eslint",
@@ -24,37 +24,44 @@
     "ngx-extractor": "ngx-extractor",
     "stylelint": "stylelint"
   },
+  "workspaces": [
+    "../packages/*"
+  ],
   "typings": "*.d.ts",
   "devDependencies": {
-    "@angular-devkit/build-angular": "^15.1.6",
-    "@angular-eslint/builder": "^15.2.1",
-    "@angular-eslint/eslint-plugin": "^15.2.1",
-    "@angular-eslint/eslint-plugin-template": "^15.2.1",
-    "@angular-eslint/schematics": "^15.2.1",
-    "@angular-eslint/template-parser": "^15.2.1",
-    "@angular/animations": "^15.1.5",
-    "@angular/cdk": "^15.1.4",
-    "@angular/cli": "^15.1.6",
-    "@angular/common": "^15.1.5",
-    "@angular/compiler": "^15.1.5",
-    "@angular/compiler-cli": "^15.1.5",
-    "@angular/core": "^15.1.5",
-    "@angular/forms": "^15.1.5",
-    "@angular/localize": "^15.1.5",
-    "@angular/platform-browser": "^15.1.5",
-    "@angular/platform-browser-dynamic": "^15.1.5",
-    "@angular/router": "^15.1.5",
-    "@angular/service-worker": "^15.1.5",
+    "@angular-devkit/build-angular": "^17.0.9",
+    "@angular-eslint/builder": "^17.1.1",
+    "@angular-eslint/eslint-plugin": "^17.1.1",
+    "@angular-eslint/eslint-plugin-template": "^17.1.1",
+    "@angular-eslint/schematics": "^17.1.1",
+    "@angular-eslint/template-parser": "^17.1.1",
+    "@angular/animations": "^17.0.8",
+    "@angular/cdk": "^17.0.4",
+    "@angular/cli": "^17.0.9",
+    "@angular/common": "^17.0.8",
+    "@angular/compiler": "^17.0.8",
+    "@angular/compiler-cli": "^17.0.8",
+    "@angular/core": "^17.0.8",
+    "@angular/forms": "^17.0.8",
+    "@angular/localize": "^17.0.8",
+    "@angular/platform-browser": "^17.0.8",
+    "@angular/platform-browser-dynamic": "^17.0.8",
+    "@angular/router": "^17.0.8",
+    "@angular/service-worker": "^17.0.8",
     "@babel/core": "^7.18.5",
     "@babel/preset-env": "^7.18.2",
-    "@ng-bootstrap/ng-bootstrap": "^14.0.1",
-    "@ng-select/ng-select": "^10.0.3",
+    "@formatjs/intl-locale": "^3.3.1",
+    "@formatjs/intl-pluralrules": "^5.2.2",
+    "@ng-bootstrap/ng-bootstrap": "^16.0.0",
+    "@ng-select/ng-select": "^12.0.4",
     "@ngx-loading-bar/core": "^6.0.0",
     "@ngx-loading-bar/http-client": "^6.0.0",
     "@ngx-loading-bar/router": "^6.0.0",
     "@peertube/maildev": "^1.2.0",
-    "@peertube/p2p-media-loader-core": "^1.0.14",
-    "@peertube/p2p-media-loader-hlsjs": "^1.0.14",
+    "@peertube/p2p-media-loader-core": "^1.0.15",
+    "@peertube/p2p-media-loader-hlsjs": "^1.0.15",
+    "@peertube/peertube-core-utils": "*",
+    "@peertube/peertube-models": "*",
     "@peertube/videojs-contextmenu": "^5.5.0",
     "@peertube/xliffmerge": "^2.0.3",
     "@popperjs/core": "^2.11.5",
@@ -64,83 +71,69 @@
     "@types/jschannel": "^1.0.0",
     "@types/linkifyjs": "^2.1.2",
     "@types/lodash-es": "^4.17.0",
-    "@types/markdown-it": "^12.0.1",
+    "@types/markdown-it": "^13.0.2",
     "@types/node": "^18.13.0",
-    "@types/sanitize-html": "2.6.2",
+    "@types/qrcode": "^1.5.5",
+    "@types/sanitize-html": "2.11.0",
     "@types/sha.js": "^2.4.0",
     "@types/video.js": "^7.3.40",
-    "@types/webtorrent": "^0.109.0",
-    "@typescript-eslint/eslint-plugin": "^5.43.0",
-    "@typescript-eslint/parser": "^5.43.0",
-    "@wdio/browserstack-service": "^7.25.2",
-    "@wdio/cli": "^7.25.2",
-    "@wdio/local-runner": "^7.25.2",
-    "@wdio/mocha-framework": "^7.25.2",
-    "@wdio/shared-store-service": "^7.25.2",
-    "@wdio/spec-reporter": "^7.25.1",
-    "angular2-hotkeys": "^13.1.0",
-    "angularx-qrcode": "15.0.1",
+    "@typescript-eslint/eslint-plugin": "^7.0.2",
+    "@typescript-eslint/parser": "^7.0.2",
+    "@wdio/browserstack-service": "^8.10.5",
+    "@wdio/cli": "^8.10.5",
+    "@wdio/local-runner": "^8.10.5",
+    "@wdio/mocha-framework": "^8.10.4",
+    "@wdio/shared-store-service": "^8.10.5",
+    "@wdio/spec-reporter": "^8.10.5",
+    "angularx-qrcode": "17.0.0",
     "babel-loader": "^9.1.0",
     "bootstrap": "^5.1.3",
     "buffer": "^6.0.3",
-    "cache-chunk-store": "^3.0.0",
-    "chart.js": "^3.8.0",
-    "chartjs-plugin-zoom": "~1.2.1",
-    "chromedriver": "^110.0.0",
+    "chart.js": "^4.3.0",
+    "chartjs-plugin-zoom": "~2.0.1",
     "core-js": "^3.22.8",
     "css-loader": "^6.2.0",
     "debug": "^4.3.1",
-    "dexie": "^3.2.2",
     "eslint": "^8.28.0",
-    "eslint-plugin-import": "2.27.5",
-    "eslint-plugin-jsdoc": "^40.0.0",
+    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-jsdoc": "^48.1.0",
     "eslint-plugin-prefer-arrow": "latest",
-    "expect-webdriverio": "^3.4.0",
+    "expect-webdriverio": "^4.2.3",
     "focus-visible": "^5.0.2",
-    "geckodriver": "^3.2.0",
-    "hls.js": "1.3.3",
-    "html-loader": "^4.1.0",
+    "hls.js": "~1.3",
+    "html-loader": "^5.0.0",
     "html-webpack-plugin": "^5.3.1",
-    "https-browserify": "^1.0.0",
     "intl-messageformat": "^10.1.0",
     "jschannel": "^1.0.2",
     "linkify-html": "^4.0.2",
     "linkifyjs": "^4.0.2",
     "lodash-es": "^4.17.4",
-    "markdown-it": "13.0.1",
+    "markdown-it": "14.0.0",
+    "markdown-it-emoji": "^3.0.0",
     "mini-css-extract-plugin": "^2.2.0",
-    "ngx-uploadx": "^5.1.0",
+    "ngx-uploadx": "^6.1.0",
     "path-browserify": "^1.0.0",
     "postcss": "^8.4.14",
-    "primeng": "^15.2.0",
-    "process": "^0.11.10",
-    "purify-css": "^1.2.5",
-    "querystring": "^0.2.1",
+    "primeng": "^17.3.1",
     "raw-loader": "^4.0.2",
     "rxjs": "^7.3.0",
     "sanitize-html": "^2.1.2",
     "sass": "^1.58.1",
-    "sass-loader": "^13.2.0",
+    "sass-loader": "^14.1.1",
     "sha.js": "^2.4.11",
     "socket.io-client": "^4.5.4",
-    "stream-browserify": "^3.0.0",
-    "stream-http": "^3.0.0",
-    "stylelint": "^15.1.0",
-    "stylelint-config-sass-guidelines": "^9.0.1",
+    "stylelint": "^16.2.1",
+    "stylelint-config-sass-guidelines": "^11.0.0",
+    "tinykeys": "^2.1.0",
     "ts-loader": "^9.3.0",
+    "ts-node": "^10.9.1",
     "tslib": "^2.4.0",
-    "typescript": "~4.9.5",
-    "url": "^0.11.0",
+    "typescript": "~5.2",
     "video.js": "^7.19.2",
-    "videostream": "~3.2.1",
-    "wdio-chromedriver-service": "^7.3.2",
-    "wdio-geckodriver-service": "^3.0.2",
     "webpack": "^5.73.0",
     "webpack-bundle-analyzer": "^4.4.2",
     "webpack-cli": "^5.0.1",
-    "webtorrent": "1.8.26",
-    "whatwg-fetch": "^3.0.0",
-    "zone.js": "~0.12.0"
+    "zone.js": "~0.14.2"
   },
   "dependencies": {}
 }

client/src/app/+about/about-follows/about-follows.component.html

@@ -1,28 +1,30 @@
-<div class="row">
-  <h1 class="visually-hidden" i18n>Follows</h1>
+<div class="margin-content mt-4">
+  <div class="row">
+    <h1 class="visually-hidden" i18n>Follows</h1>
 
-  <div class="col-xl-6 col-md-12">
-    <h2 i18n class="fs-5-5 mb-4 fw-semibold">Followers of {{ instanceName }} ({{ followersPagination.totalItems }})</h2>
+    <div class="col-xl-6 col-md-12">
+      <h2 i18n class="fs-5-5 mb-4 fw-semibold">Followers of {{ instanceName }} ({{ followersPagination.totalItems }})</h2>
 
-    <div i18n class="no-results" *ngIf="followersPagination.totalItems === 0">{{ instanceName }} does not have followers.</div>
+      <div i18n class="no-results" *ngIf="followersPagination.totalItems === 0">{{ instanceName }} does not have followers.</div>
 
-    <a *ngFor="let follower of followers" [href]="buildLink(follower)" target="_blank" rel="noopener noreferrer">
-      {{ follower }}
-    </a>
+      <a *ngFor="let follower of followers" [href]="follower.url" target="_blank" rel="noopener noreferrer">
+        {{ follower.name }}
+      </a>
+
+      <button i18n class="peertube-button-link grey-button mt-1" *ngIf="!loadedAllFollowers && canLoadMoreFollowers()" (click)="loadAllFollowers()">Show full list</button>
+    </div>
+
+    <div class="col-xl-6 col-md-12">
+      <h2 i18n class="fs-5-5 mb-4 fw-semibold">Subscriptions of {{ instanceName }} ({{ followingsPagination.totalItems }})</h2>
+
+      <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">{{ instanceName }} does not have subscriptions.</div>
+
+      <a *ngFor="let following of followings" [href]="following.url" target="_blank" rel="noopener noreferrer">
+        {{ following.name }}
+      </a>
+
+      <button i18n class="peertube-button-link grey-button mt-1" *ngIf="!loadedAllFollowings && canLoadMoreFollowings()" (click)="loadAllFollowings()">Show full list</button>
+    </div>
 
-    <button i18n class="peertube-button-link grey-button mt-1" *ngIf="!loadedAllFollowers && canLoadMoreFollowers()" (click)="loadAllFollowers()">Show full list</button>
   </div>
-
-  <div class="col-xl-6 col-md-12">
-    <h2 i18n class="fs-5-5 mb-4 fw-semibold">Subscriptions of {{ instanceName }} ({{ followingsPagination.totalItems }})</h2>
-
-    <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">{{ instanceName }} does not have subscriptions.</div>
-
-    <a *ngFor="let following of followings" [href]="buildLink(following)" target="_blank" rel="noopener noreferrer">
-      {{ following }}
-    </a>
-
-    <button i18n class="peertube-button-link grey-button mt-1" *ngIf="!loadedAllFollowings && canLoadMoreFollowings()" (click)="loadAllFollowings()">Show full list</button>
-  </div>
-
 </div>

client/src/app/+about/about-follows/about-follows.component.ts

@@ -1,20 +1,23 @@
 import { SortMeta } from 'primeng/api'
 import { Component, OnInit } from '@angular/core'
 import { ComponentPagination, hasMoreItems, Notifier, RestService, ServerService } from '@app/core'
-import { InstanceFollowService } from '@app/shared/shared-instance'
-import { Actor } from '@shared/models/actors'
+import { Actor } from '@peertube/peertube-models'
+import { NgIf, NgFor } from '@angular/common'
+import { InstanceFollowService } from '@app/shared/shared-instance/instance-follow.service'
 
 @Component({
   selector: 'my-about-follows',
   templateUrl: './about-follows.component.html',
-  styleUrls: [ './about-follows.component.scss' ]
+  styleUrls: [ './about-follows.component.scss' ],
+  standalone: true,
+  imports: [ NgIf, NgFor ]
 })
 
 export class AboutFollowsComponent implements OnInit {
   instanceName: string
 
-  followers: string[] = []
-  followings: string[] = []
+  followers: { name: string, url: string }[] = []
+  followings: { name: string, url: string }[] = []
 
   loadedAllFollowers = false
   loadedAllFollowings = false
@@ -130,10 +133,13 @@ export class AboutFollowsComponent implements OnInit {
   }
 
   private formatFollow (actor: Actor) {
-    // Instance follow, only display host
-    if (actor.name === 'peertube') return actor.host
+    return {
+      // Instance follow, only display host
+      name: actor.name === 'peertube'
+        ? actor.host
+        : actor.name + '@' + actor.host,
 
-    return actor.name + '@' + actor.host
+      url: actor.url
+    }
   }
-
 }

client/src/app/+about/about-instance/about-instance.component.html

@@ -1,226 +1,232 @@
-<div class="row">
-  <div class="col-md-12 col-xl-6">
+<div class="banner" *ngIf="instanceBannerUrl">
+  <img [src]="instanceBannerUrl" alt="Instance banner">
+</div>
 
-    <div class="d-flex justify-content-between">
-      <h1 i18n class="fw-semibold fs-5">About {{ instanceName }}</h1>
+<div class="margin-content mt-4">
+  <div class="row ">
+    <div class="col-md-12 col-xl-6">
 
-      <a routerLink="/about/contact" i18n *ngIf="isContactFormEnabled" class="peertube-button-link orange-button h-100 d-flex align-items-center">Contact us</a>
-    </div>
+      <div class="d-flex justify-content-between">
+        <h1 i18n class="fw-semibold fs-5">About {{ instanceName }}</h1>
 
-    <div class="mb-4" *ngIf="categories.length !== 0 || languages.length !== 0">
-      <span *ngFor="let category of categories" class="pt-badge badge-primary">{{ category }}</span>
+        <a routerLink="/about/contact" i18n *ngIf="isContactFormEnabled" class="peertube-button-link orange-button h-100 d-flex align-items-center">Contact us</a>
+      </div>
 
-      <span *ngFor="let language of languages" class="pt-badge badge-secondary">{{ language }}</span>
-    </div>
+      <div class="mb-4" *ngIf="categories.length !== 0 || languages.length !== 0">
+        <span *ngFor="let category of categories" class="pt-badge badge-primary">{{ category }}</span>
 
-    <div class="mt-2">
-      <div class="block">{{ shortDescription }}</div>
+        <span *ngFor="let language of languages" class="pt-badge badge-secondary">{{ language }}</span>
+      </div>
 
-      <div i18n *ngIf="isNSFW" class="block mt-4 fw-semibold">This instance is dedicated to sensitive/NSFW content.</div>
-    </div>
+      <div class="mt-2">
+        <div class="block">{{ shortDescription }}</div>
 
-    <div class="anchor" id="administrators-and-sustainability"></div>
-    <a
-      *ngIf="aboutHTML.administrator || aboutHTML.maintenanceLifetime || aboutHTML.businessModel"
-      class="anchor-link"
-      routerLink="/about/instance"
-      fragment="administrators-and-sustainability"
-      #anchorLink
-      (click)="onClickCopyLink(anchorLink)"
-    >
-      <h2 i18n class="middle-title">
-        ADMINISTRATORS & SUSTAINABILITY
-      </h2>
-    </a>
+        <div i18n *ngIf="isNSFW" class="block mt-4 fw-semibold">This instance is dedicated to sensitive/NSFW content.</div>
+      </div>
 
-    <div class="block administrator" *ngIf="aboutHTML.administrator">
-      <div class="anchor" id="administrators"></div>
+      <div class="anchor" id="administrators-and-sustainability"></div>
       <a
+        *ngIf="aboutHTML.administrator || aboutHTML.maintenanceLifetime || aboutHTML.businessModel"
         class="anchor-link"
         routerLink="/about/instance"
-        fragment="administrators"
+        fragment="administrators-and-sustainability"
         #anchorLink
-        (click)="onClickCopyLink(anchorLink)">
-        <h3 i18n class="section-title">Who we are</h3>
-      </a>
-
-      <div [innerHTML]="aboutHTML.administrator"></div>
-    </div>
-
-    <div class="block creation-reason" *ngIf="aboutHTML.creationReason">
-      <div class="anchor" id="creation-reason"></div>
-      <a
-        class="anchor-link"
-        routerLink="/about/instance"
-        fragment="creation-reason"
-        #anchorLink
-        (click)="onClickCopyLink(anchorLink)">
-        <h3 i18n class="section-title">Why we created this instance</h3>
-      </a>
-
-      <div [innerHTML]="aboutHTML.creationReason"></div>
-    </div>
-
-    <div class="block maintenance-lifetime" *ngIf="aboutHTML.maintenanceLifetime">
-      <div class="anchor" id="maintenance-lifetime"></div>
-      <a
-        class="anchor-link"
-        routerLink="/about/instance"
-        fragment="maintenance-lifetime"
-        #anchorLink
-        (click)="onClickCopyLink(anchorLink)">
-        <h3 i18n class="section-title">How long we plan to maintain this instance</h3>
-      </a>
-
-      <div [innerHTML]="aboutHTML.maintenanceLifetime"></div>
-    </div>
-
-    <div class="block business-model" *ngIf="aboutHTML.businessModel">
-        <div class="anchor" id="business-model"></div>
-        <a
-          class="anchor-link"
-          routerLink="/about/instance"
-          fragment="business-model"
-          #anchorLink
-          (click)="onClickCopyLink(anchorLink)">
-          <h3 i18n class="section-title">How we will pay for keeping our instance running</h3>
-        </a>
-
-      <div [innerHTML]="aboutHTML.businessModel"></div>
-    </div>
-
-    <div class="anchor" id="information"></div>
-    <a
-      *ngIf="descriptionElement"
-      class="anchor-link"
-      routerLink="/about/instance"
-      fragment="information"
-      #anchorLink
-      (click)="onClickCopyLink(anchorLink)">
-      <h2 i18n class="middle-title">
-        INFORMATION
-      </h2>
-    </a>
-
-    <div class="block description">
-      <div class="anchor" id="description"></div>
-      <a
-        class="anchor-link"
-        routerLink="/about/instance"
-        fragment="description"
-        #anchorLink
-        (click)="onClickCopyLink(anchorLink)">
-        <h3 i18n class="section-title">Description</h3>
-      </a>
-
-      <my-custom-markup-container [content]="descriptionElement"></my-custom-markup-container>
-    </div>
-
-    <div myPluginSelector pluginSelectorId="about-instance-moderation">
-      <div class="anchor" id="moderation"></div>
-      <a
-        *ngIf="aboutHTML.moderationInformation || aboutHTML.codeOfConduct || aboutHTML.terms"
-        class="anchor-link"
-        routerLink="/about/instance"
-        fragment="moderation"
-        #anchorLink
-        (click)="onClickCopyLink(anchorLink)">
+        (click)="onClickCopyLink(anchorLink)"
+      >
         <h2 i18n class="middle-title">
-          MODERATION
+          ADMINISTRATORS & SUSTAINABILITY
         </h2>
       </a>
 
-      <div class="block moderation-information" *ngIf="aboutHTML.moderationInformation">
-        <div class="anchor" id="moderation-information"></div>
+      <div class="block administrator" *ngIf="aboutHTML.administrator">
+        <div class="anchor" id="administrators"></div>
         <a
           class="anchor-link"
           routerLink="/about/instance"
-          fragment="moderation-information"
+          fragment="administrators"
           #anchorLink
           (click)="onClickCopyLink(anchorLink)">
-          <h3 i18n class="section-title">Moderation information</h3>
+          <h3 i18n class="section-title">Who we are</h3>
         </a>
 
-        <div [innerHTML]="aboutHTML.moderationInformation"></div>
+        <div [innerHTML]="aboutHTML.administrator"></div>
       </div>
 
-      <div class="block code-of-conduct" *ngIf="aboutHTML.codeOfConduct">
-        <div class="anchor" id="code-of-conduct"></div>
+      <div class="block creation-reason" *ngIf="aboutHTML.creationReason">
+        <div class="anchor" id="creation-reason"></div>
         <a
           class="anchor-link"
           routerLink="/about/instance"
-          fragment="code-of-conduct"
+          fragment="creation-reason"
           #anchorLink
           (click)="onClickCopyLink(anchorLink)">
-          <h3 i18n class="section-title">Code of conduct</h3>
+          <h3 i18n class="section-title">Why we created this instance</h3>
         </a>
 
-        <div [innerHTML]="aboutHTML.codeOfConduct"></div>
+        <div [innerHTML]="aboutHTML.creationReason"></div>
       </div>
 
-      <div class="block terms">
-        <div class="anchor" id="terms"></div>
+      <div class="block maintenance-lifetime" *ngIf="aboutHTML.maintenanceLifetime">
+        <div class="anchor" id="maintenance-lifetime"></div>
         <a
           class="anchor-link"
           routerLink="/about/instance"
-          fragment="terms"
+          fragment="maintenance-lifetime"
           #anchorLink
           (click)="onClickCopyLink(anchorLink)">
-          <h3 i18n class="section-title">Terms</h3>
+          <h3 i18n class="section-title">How long we plan to maintain this instance</h3>
         </a>
 
-        <div [innerHTML]="aboutHTML.terms"></div>
+        <div [innerHTML]="aboutHTML.maintenanceLifetime"></div>
       </div>
-    </div>
 
-    <div myPluginSelector pluginSelectorId="about-instance-other-information">
-      <div class="anchor" id="other-information"></div>
+      <div class="block business-model" *ngIf="aboutHTML.businessModel">
+          <div class="anchor" id="business-model"></div>
+          <a
+            class="anchor-link"
+            routerLink="/about/instance"
+            fragment="business-model"
+            #anchorLink
+            (click)="onClickCopyLink(anchorLink)">
+            <h3 i18n class="section-title">How we will pay for keeping our instance running</h3>
+          </a>
+
+        <div [innerHTML]="aboutHTML.businessModel"></div>
+      </div>
+
+      <div class="anchor" id="information"></div>
       <a
-        *ngIf="aboutHTML.hardwareInformation"
+        *ngIf="descriptionElement"
         class="anchor-link"
         routerLink="/about/instance"
-        fragment="other-information"
+        fragment="information"
         #anchorLink
         (click)="onClickCopyLink(anchorLink)">
         <h2 i18n class="middle-title">
-          OTHER INFORMATION
+          INFORMATION
         </h2>
       </a>
 
-      <div class="block hardware-information" *ngIf="aboutHTML.hardwareInformation">
-        <div class="anchor" id="hardware-information"></div>
+      <div class="block description">
+        <div class="anchor" id="description"></div>
         <a
           class="anchor-link"
           routerLink="/about/instance"
-          fragment="hardware-information"
+          fragment="description"
           #anchorLink
           (click)="onClickCopyLink(anchorLink)">
-          <h3 i18n class="section-title">Hardware information</h3>
+          <h3 i18n class="section-title">Description</h3>
         </a>
 
-        <div [innerHTML]="aboutHTML.hardwareInformation"></div>
+        <my-custom-markup-container [content]="descriptionElement"></my-custom-markup-container>
+      </div>
+
+      <div myPluginSelector pluginSelectorId="about-instance-moderation">
+        <div class="anchor" id="moderation"></div>
+        <a
+          *ngIf="aboutHTML.moderationInformation || aboutHTML.codeOfConduct || aboutHTML.terms"
+          class="anchor-link"
+          routerLink="/about/instance"
+          fragment="moderation"
+          #anchorLink
+          (click)="onClickCopyLink(anchorLink)">
+          <h2 i18n class="middle-title">
+            MODERATION
+          </h2>
+        </a>
+
+        <div class="block moderation-information" *ngIf="aboutHTML.moderationInformation">
+          <div class="anchor" id="moderation-information"></div>
+          <a
+            class="anchor-link"
+            routerLink="/about/instance"
+            fragment="moderation-information"
+            #anchorLink
+            (click)="onClickCopyLink(anchorLink)">
+            <h3 i18n class="section-title">Moderation information</h3>
+          </a>
+
+          <div [innerHTML]="aboutHTML.moderationInformation"></div>
+        </div>
+
+        <div class="block code-of-conduct" *ngIf="aboutHTML.codeOfConduct">
+          <div class="anchor" id="code-of-conduct"></div>
+          <a
+            class="anchor-link"
+            routerLink="/about/instance"
+            fragment="code-of-conduct"
+            #anchorLink
+            (click)="onClickCopyLink(anchorLink)">
+            <h3 i18n class="section-title">Code of conduct</h3>
+          </a>
+
+          <div [innerHTML]="aboutHTML.codeOfConduct"></div>
+        </div>
+
+        <div class="block terms">
+          <div class="anchor" id="terms"></div>
+          <a
+            class="anchor-link"
+            routerLink="/about/instance"
+            fragment="terms"
+            #anchorLink
+            (click)="onClickCopyLink(anchorLink)">
+            <h3 i18n class="section-title">Terms</h3>
+          </a>
+
+          <div [innerHTML]="aboutHTML.terms"></div>
+        </div>
+      </div>
+
+      <div myPluginSelector pluginSelectorId="about-instance-other-information">
+        <div class="anchor" id="other-information"></div>
+        <a
+          *ngIf="aboutHTML.hardwareInformation"
+          class="anchor-link"
+          routerLink="/about/instance"
+          fragment="other-information"
+          #anchorLink
+          (click)="onClickCopyLink(anchorLink)">
+          <h2 i18n class="middle-title">
+            OTHER INFORMATION
+          </h2>
+        </a>
+
+        <div class="block hardware-information" *ngIf="aboutHTML.hardwareInformation">
+          <div class="anchor" id="hardware-information"></div>
+          <a
+            class="anchor-link"
+            routerLink="/about/instance"
+            fragment="hardware-information"
+            #anchorLink
+            (click)="onClickCopyLink(anchorLink)">
+            <h3 i18n class="section-title">Hardware information</h3>
+          </a>
+
+          <div [innerHTML]="aboutHTML.hardwareInformation"></div>
+        </div>
       </div>
     </div>
-  </div>
 
-  <div class="col-md-12 col-xl-6" myPluginSelector pluginSelectorId="about-instance-features">
-    <h2 class="visually-hidden" i18n>FEATURES</h2>
-    <my-instance-features-table></my-instance-features-table>
-  </div>
+    <div class="col-md-12 col-xl-6" myPluginSelector pluginSelectorId="about-instance-features">
+      <h2 class="visually-hidden" i18n>FEATURES</h2>
+      <my-instance-features-table></my-instance-features-table>
+    </div>
 
-  <div class="col" myPluginSelector pluginSelectorId="about-instance-statistics">
-    <div class="anchor" id="statistics"></div>
+    <div class="col" myPluginSelector pluginSelectorId="about-instance-statistics">
+      <div class="anchor" id="statistics"></div>
 
-    <a
-      class="anchor-link"
-      routerLink="/about/instance"
-      fragment="statistics"
-      #anchorLink
-      (click)="onClickCopyLink(anchorLink)">
-      <h2 i18n class="middle-title">STATISTICS</h2>
-    </a>
+      <a
+        class="anchor-link"
+        routerLink="/about/instance"
+        fragment="statistics"
+        #anchorLink
+        (click)="onClickCopyLink(anchorLink)">
+        <h2 i18n class="middle-title">STATISTICS</h2>
+      </a>
 
-    <my-instance-statistics [serverStats]="serverStats"></my-instance-statistics>
+      <my-instance-statistics [serverStats]="serverStats"></my-instance-statistics>
+    </div>
   </div>
 </div>
 

client/src/app/+about/about-instance/about-instance.component.ts

@@ -1,17 +1,33 @@
-import { ViewportScroller } from '@angular/common'
+import { NgFor, NgIf, ViewportScroller } from '@angular/common'
 import { AfterViewChecked, Component, ElementRef, OnInit, ViewChild } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
+import { ActivatedRoute, RouterLink } from '@angular/router'
 import { Notifier, ServerService } from '@app/core'
-import { AboutHTML } from '@app/shared/shared-instance'
+import { AboutHTML } from '@app/shared/shared-main/instance/instance.service'
+import { maxBy } from '@peertube/peertube-core-utils'
+import { HTMLServerConfig, ServerStats } from '@peertube/peertube-models'
 import { copyToClipboard } from '@root-helpers/utils'
-import { HTMLServerConfig, ServerStats } from '@shared/models/server'
+import { CustomMarkupContainerComponent } from '../../shared/shared-custom-markup/custom-markup-container.component'
+import { InstanceFeaturesTableComponent } from '../../shared/shared-instance/instance-features-table.component'
+import { PluginSelectorDirective } from '../../shared/shared-main/plugins/plugin-selector.directive'
 import { ResolverData } from './about-instance.resolver'
 import { ContactAdminModalComponent } from './contact-admin-modal.component'
+import { InstanceStatisticsComponent } from './instance-statistics.component'
 
 @Component({
   selector: 'my-about-instance',
   templateUrl: './about-instance.component.html',
-  styleUrls: [ './about-instance.component.scss' ]
+  styleUrls: [ './about-instance.component.scss' ],
+  standalone: true,
+  imports: [
+    NgIf,
+    RouterLink,
+    NgFor,
+    CustomMarkupContainerComponent,
+    PluginSelectorDirective,
+    InstanceFeaturesTableComponent,
+    InstanceStatisticsComponent,
+    ContactAdminModalComponent
+  ]
 })
 export class AboutInstanceComponent implements OnInit, AfterViewChecked {
   @ViewChild('descriptionWrapper') descriptionWrapper: ElementRef<HTMLInputElement>
@@ -20,6 +36,8 @@ export class AboutInstanceComponent implements OnInit, AfterViewChecked {
   aboutHTML: AboutHTML
   descriptionElement: HTMLDivElement
 
+  instanceBannerUrl: string
+
   languages: string[] = []
   categories: string[] = []
   shortDescription = ''
@@ -64,6 +82,10 @@ export class AboutInstanceComponent implements OnInit, AfterViewChecked {
 
     this.shortDescription = about.instance.shortDescription
 
+    this.instanceBannerUrl = about.instance.banners.length !== 0
+      ? maxBy(about.instance.banners, 'width').path
+      : undefined
+
     this.serverConfig = this.serverService.getHTMLConfig()
 
     this.route.data.subscribe(data => {