16 files changed, 190 insertions, 35 deletions

diff --git a/shared/server-commands/requests/requests.ts b/shared/server-commands/requests/requests.ts
index e3f1817f1..8227017eb 100644
--- a/shared/server-commands/requests/requests.ts
+++ b/shared/server-commands/requests/requests.ts
@@ -29,6 +29,7 @@ function makeRawRequest (options: {
   range?: string
   query?: { [ id: string ]: string }
   method?: 'GET' | 'POST'
+  headers?: { [ name: string ]: string }
 }) {
   const { host, protocol, pathname } = new URL(options.url)
 
@@ -37,7 +38,7 @@ function makeRawRequest (options: {
     path: pathname,
     contentType: undefined,
 
-    ...pick(options, [ 'expectedStatus', 'range', 'token', 'query' ])
+    ...pick(options, [ 'expectedStatus', 'range', 'token', 'query', 'headers' ])
   }
 
   if (options.method === 'POST') {
@@ -132,6 +133,7 @@ function makePutBodyRequest (options: {
   token?: string
   fields: { [ fieldName: string ]: any }
   expectedStatus?: HttpStatusCode
+  headers?: { [name: string]: string }
 }) {
   const req = request(options.url).put(options.path)
                                   .send(options.fields)
diff --git a/shared/server-commands/server/config-command.ts b/shared/server-commands/server/config-command.ts
index b94bd2625..7f1e9d977 100644
--- a/shared/server-commands/server/config-command.ts
+++ b/shared/server-commands/server/config-command.ts
@@ -131,7 +131,7 @@ export class ConfigCommand extends AbstractCommand {
   }
 
   // TODO: convert args to object
-  enableTranscoding (webtorrent = true, hls = true, with0p = false) {
+  enableTranscoding (webVideo = true, hls = true, with0p = false) {
     return this.updateExistingSubConfig({
       newConfig: {
         transcoding: {
@@ -142,8 +142,8 @@ export class ConfigCommand extends AbstractCommand {
 
           resolutions: ConfigCommand.getCustomConfigResolutions(true, with0p),
 
-          webtorrent: {
-            enabled: webtorrent
+          webVideos: {
+            enabled: webVideo
           },
           hls: {
             enabled: hls
@@ -154,19 +154,23 @@ export class ConfigCommand extends AbstractCommand {
   }
 
   // TODO: convert args to object
-  enableMinimumTranscoding (webtorrent = true, hls = true) {
+  enableMinimumTranscoding (webVideo = true, hls = true) {
     return this.updateExistingSubConfig({
       newConfig: {
         transcoding: {
           enabled: true,
+
+          allowAudioFiles: true,
+          allowAdditionalExtensions: true,
+
           resolutions: {
             ...ConfigCommand.getCustomConfigResolutions(false),
 
             '240p': true
           },
 
-          webtorrent: {
-            enabled: webtorrent
+          webVideos: {
+            enabled: webVideo
           },
           hls: {
             enabled: hls
@@ -368,6 +372,9 @@ export class ConfigCommand extends AbstractCommand {
         },
         torrents: {
           size: 4
+        },
+        storyboards: {
+          size: 5
         }
       },
       signup: {
@@ -417,7 +424,7 @@ export class ConfigCommand extends AbstractCommand {
           '2160p': false
         },
         alwaysTranscodeOriginalResolution: true,
-        webtorrent: {
+        webVideos: {
           enabled: true
         },
         hls: {
diff --git a/shared/server-commands/server/jobs.ts b/shared/server-commands/server/jobs.ts
index ff3098063..8f131fba4 100644
--- a/shared/server-commands/server/jobs.ts
+++ b/shared/server-commands/server/jobs.ts
@@ -33,6 +33,8 @@ async function waitJobs (
 
     // Check if each server has pending request
     for (const server of servers) {
+      if (process.env.DEBUG) console.log('Checking ' + server.url)
+
       for (const state of states) {
 
         const jobPromise = server.jobs.list({
@@ -45,6 +47,10 @@ async function waitJobs (
           .then(jobs => {
             if (jobs.length !== 0) {
               pendingRequests = true
+
+              if (process.env.DEBUG) {
+                console.log(jobs)
+              }
             }
           })
 
@@ -55,6 +61,10 @@ async function waitJobs (
         .then(obj => {
           if (obj.activityPubMessagesWaiting !== 0) {
             pendingRequests = true
+
+            if (process.env.DEBUG) {
+              console.log('AP messages waiting: ' + obj.activityPubMessagesWaiting)
+            }
           }
         })
       tasks.push(debugPromise)
@@ -65,12 +75,15 @@ async function waitJobs (
             for (const job of data) {
               if (job.state.id !== RunnerJobState.COMPLETED) {
                 pendingRequests = true
+
+                if (process.env.DEBUG) {
+                  console.log(job)
+                }
               }
             }
           })
         tasks.push(runnerJobsPromise)
       }
-
     }
 
     return tasks
diff --git a/shared/server-commands/server/object-storage-command.ts b/shared/server-commands/server/object-storage-command.ts
index 7d8ec93cd..6bb232c36 100644
--- a/shared/server-commands/server/object-storage-command.ts
+++ b/shared/server-commands/server/object-storage-command.ts
@@ -42,7 +42,7 @@ export class ObjectStorageCommand {
           bucket_name: this.getMockStreamingPlaylistsBucketName()
         },
 
-        videos: {
+        web_videos: {
           bucket_name: this.getMockWebVideosBucketName()
         }
       }
@@ -136,9 +136,9 @@ export class ObjectStorageCommand {
           prefix: `test:server-${serverNumber}-streaming-playlists:`
         },
 
-        videos: {
+        web_videos: {
           bucket_name: this.DEFAULT_SCALEWAY_BUCKET,
-          prefix: `test:server-${serverNumber}-videos:`
+          prefix: `test:server-${serverNumber}-web-videos:`
         }
       }
     }
diff --git a/shared/server-commands/server/server.ts b/shared/server-commands/server/server.ts
index 70f7a3ee2..38568a890 100644
--- a/shared/server-commands/server/server.ts
+++ b/shared/server-commands/server/server.ts
@@ -32,8 +32,10 @@ import {
   HistoryCommand,
   ImportsCommand,
   LiveCommand,
+  VideoPasswordsCommand,
   PlaylistsCommand,
   ServicesCommand,
+  StoryboardCommand,
   StreamingPlaylistsCommand,
   VideosCommand,
   VideoStudioCommand,
@@ -146,6 +148,9 @@ export class PeerTubeServer {
   twoFactor?: TwoFactorCommand
   videoToken?: VideoTokenCommand
   registrations?: RegistrationsCommand
+  videoPasswords?: VideoPasswordsCommand
+
+  storyboard?: StoryboardCommand
 
   runners?: RunnersCommand
   runnerRegistrationTokens?: RunnerRegistrationTokensCommand
@@ -232,7 +237,7 @@ export class PeerTubeServer {
     }
 
     // Share the environment
-    const env = Object.create(process.env)
+    const env = { ...process.env }
     env['NODE_ENV'] = 'test'
     env['NODE_APP_INSTANCE'] = this.internalServerNumber.toString()
     env['NODE_CONFIG'] = JSON.stringify(configOverride)
@@ -365,12 +370,13 @@ export class PeerTubeServer {
         tmp_persistent: this.getDirectoryPath('tmp-persistent') + '/',
         bin: this.getDirectoryPath('bin') + '/',
         avatars: this.getDirectoryPath('avatars') + '/',
-        videos: this.getDirectoryPath('videos') + '/',
+        web_videos: this.getDirectoryPath('web-videos') + '/',
         streaming_playlists: this.getDirectoryPath('streaming-playlists') + '/',
         redundancy: this.getDirectoryPath('redundancy') + '/',
         logs: this.getDirectoryPath('logs') + '/',
         previews: this.getDirectoryPath('previews') + '/',
         thumbnails: this.getDirectoryPath('thumbnails') + '/',
+        storyboards: this.getDirectoryPath('storyboards') + '/',
         torrents: this.getDirectoryPath('torrents') + '/',
         captions: this.getDirectoryPath('captions') + '/',
         cache: this.getDirectoryPath('cache') + '/',
@@ -434,8 +440,11 @@ export class PeerTubeServer {
     this.videoToken = new VideoTokenCommand(this)
     this.registrations = new RegistrationsCommand(this)
 
+    this.storyboard = new StoryboardCommand(this)
+
     this.runners = new RunnersCommand(this)
     this.runnerRegistrationTokens = new RunnerRegistrationTokensCommand(this)
     this.runnerJobs = new RunnerJobsCommand(this)
+    this.videoPasswords = new VideoPasswordsCommand(this)
   }
 }
diff --git a/shared/server-commands/server/servers-command.ts b/shared/server-commands/server/servers-command.ts
index 19645cb93..c91c2b008 100644
--- a/shared/server-commands/server/servers-command.ts
+++ b/shared/server-commands/server/servers-command.ts
@@ -77,8 +77,8 @@ export class ServersCommand extends AbstractCommand {
     return join(root(), 'test' + this.server.internalServerNumber, directory)
   }
 
-  buildWebTorrentFilePath (fileUrl: string) {
-    return this.buildDirectory(join('videos', basename(fileUrl)))
+  buildWebVideoFilePath (fileUrl: string) {
+    return this.buildDirectory(join('web-videos', basename(fileUrl)))
   }
 
   buildFragmentedFilePath (videoUUID: string, fileUrl: string) {
diff --git a/shared/server-commands/shared/abstract-command.ts b/shared/server-commands/shared/abstract-command.ts
index ca4ffada9..463acc26b 100644
--- a/shared/server-commands/shared/abstract-command.ts
+++ b/shared/server-commands/shared/abstract-command.ts
@@ -101,25 +101,29 @@ abstract class AbstractCommand {
 
   protected putBodyRequest (options: InternalCommonCommandOptions & {
     fields?: { [ fieldName: string ]: any }
+    headers?: { [name: string]: string }
   }) {
-    const { fields } = options
+    const { fields, headers } = options
 
     return makePutBodyRequest({
       ...this.buildCommonRequestOptions(options),
 
-      fields
+      fields,
+      headers
     })
   }
 
   protected postBodyRequest (options: InternalCommonCommandOptions & {
     fields?: { [ fieldName: string ]: any }
+    headers?: { [name: string]: string }
   }) {
-    const { fields } = options
+    const { fields, headers } = options
 
     return makePostBodyRequest({
       ...this.buildCommonRequestOptions(options),
 
-      fields
+      fields,
+      headers
     })
   }
 
@@ -206,6 +210,12 @@ abstract class AbstractCommand {
 
     return expectedStatus !== undefined ? expectedStatus : defaultExpectedStatus
   }
+
+  protected buildVideoPasswordHeader (videoPassword: string) {
+    return videoPassword !== undefined && videoPassword !== null
+      ? { 'x-peertube-video-password': videoPassword }
+      : undefined
+  }
 }
 
 export {
diff --git a/shared/server-commands/videos/captions-command.ts b/shared/server-commands/videos/captions-command.ts
index 62bf9c5e6..a26fcb57d 100644
--- a/shared/server-commands/videos/captions-command.ts
+++ b/shared/server-commands/videos/captions-command.ts
@@ -34,14 +34,16 @@ export class CaptionsCommand extends AbstractCommand {
 
   list (options: OverrideCommandOptions & {
     videoId: string | number
+    videoPassword?: string
   }) {
-    const { videoId } = options
+    const { videoId, videoPassword } = options
     const path = '/api/v1/videos/' + videoId + '/captions'
 
     return this.getRequestBody<ResultList<VideoCaption>>({
       ...options,
 
       path,
+      headers: this.buildVideoPasswordHeader(videoPassword),
       implicitToken: false,
       defaultExpectedStatus: HttpStatusCode.OK_200
     })
diff --git a/shared/server-commands/videos/comments-command.ts b/shared/server-commands/videos/comments-command.ts
index 154ec0c24..0dab1b66a 100644
--- a/shared/server-commands/videos/comments-command.ts
+++ b/shared/server-commands/videos/comments-command.ts
@@ -36,11 +36,12 @@ export class CommentsCommand extends AbstractCommand {
 
   listThreads (options: OverrideCommandOptions & {
     videoId: number | string
+    videoPassword?: string
     start?: number
     count?: number
     sort?: string
   }) {
-    const { start, count, sort, videoId } = options
+    const { start, count, sort, videoId, videoPassword } = options
     const path = '/api/v1/videos/' + videoId + '/comment-threads'
 
     return this.getRequestBody<VideoCommentThreads>({
@@ -48,6 +49,7 @@ export class CommentsCommand extends AbstractCommand {
 
       path,
       query: { start, count, sort },
+      headers: this.buildVideoPasswordHeader(videoPassword),
       implicitToken: false,
       defaultExpectedStatus: HttpStatusCode.OK_200
     })
@@ -72,8 +74,9 @@ export class CommentsCommand extends AbstractCommand {
   async createThread (options: OverrideCommandOptions & {
     videoId: number | string
     text: string
+    videoPassword?: string
   }) {
-    const { videoId, text } = options
+    const { videoId, text, videoPassword } = options
     const path = '/api/v1/videos/' + videoId + '/comment-threads'
 
     const body = await unwrapBody<{ comment: VideoComment }>(this.postBodyRequest({
@@ -81,6 +84,7 @@ export class CommentsCommand extends AbstractCommand {
 
       path,
       fields: { text },
+      headers: this.buildVideoPasswordHeader(videoPassword),
       implicitToken: true,
       defaultExpectedStatus: HttpStatusCode.OK_200
     }))
@@ -95,8 +99,9 @@ export class CommentsCommand extends AbstractCommand {
     videoId: number | string
     toCommentId: number
     text: string
+    videoPassword?: string
   }) {
-    const { videoId, toCommentId, text } = options
+    const { videoId, toCommentId, text, videoPassword } = options
     const path = '/api/v1/videos/' + videoId + '/comments/' + toCommentId
 
     const body = await unwrapBody<{ comment: VideoComment }>(this.postBodyRequest({
@@ -104,6 +109,7 @@ export class CommentsCommand extends AbstractCommand {
 
       path,
       fields: { text },
+      headers: this.buildVideoPasswordHeader(videoPassword),
       implicitToken: true,
       defaultExpectedStatus: HttpStatusCode.OK_200
     }))
diff --git a/shared/server-commands/videos/index.ts b/shared/server-commands/videos/index.ts
index c17f6ef20..106d80af0 100644
--- a/shared/server-commands/videos/index.ts
+++ b/shared/server-commands/videos/index.ts
@@ -11,9 +11,11 @@ export * from './live-command'
 export * from './live'
 export * from './playlists-command'
 export * from './services-command'
+export * from './storyboard-command'
 export * from './streaming-playlists-command'
 export * from './comments-command'
 export * from './video-studio-command'
 export * from './video-token-command'
 export * from './views-command'
 export * from './videos-command'
+export * from './video-passwords-command'
diff --git a/shared/server-commands/videos/live-command.ts b/shared/server-commands/videos/live-command.ts
index 44d625970..6006d9fe9 100644
--- a/shared/server-commands/videos/live-command.ts
+++ b/shared/server-commands/videos/live-command.ts
@@ -120,8 +120,13 @@ export class LiveCommand extends AbstractCommand {
     saveReplay: boolean
     permanentLive: boolean
     privacy?: VideoPrivacy
+    videoPasswords?: string[]
   }) {
-    const { saveReplay, permanentLive, privacy = VideoPrivacy.PUBLIC } = options
+    const { saveReplay, permanentLive, privacy = VideoPrivacy.PUBLIC, videoPasswords } = options
+
+    const replaySettings = privacy === VideoPrivacy.PASSWORD_PROTECTED
+      ? { privacy: VideoPrivacy.PRIVATE }
+      : { privacy }
 
     const { uuid } = await this.create({
       ...options,
@@ -130,9 +135,10 @@ export class LiveCommand extends AbstractCommand {
         name: 'live',
         permanentLive,
         saveReplay,
-        replaySettings: { privacy },
+        replaySettings,
         channelId: this.server.store.channel.id,
-        privacy
+        privacy,
+        videoPasswords
       }
     })
 
diff --git a/shared/server-commands/videos/storyboard-command.ts b/shared/server-commands/videos/storyboard-command.ts
new file mode 100644
index 000000000..06d90fc12
--- /dev/null
+++ b/shared/server-commands/videos/storyboard-command.ts
@@ -0,0 +1,19 @@
+import { HttpStatusCode, Storyboard } from '@shared/models'
+import { AbstractCommand, OverrideCommandOptions } from '../shared'
+
+export class StoryboardCommand extends AbstractCommand {
+
+  list (options: OverrideCommandOptions & {
+    id: number | string
+  }) {
+    const path = '/api/v1/videos/' + options.id + '/storyboards'
+
+    return this.getRequestBody<{ storyboards: Storyboard[] }>({
+      ...options,
+
+      path,
+      implicitToken: true,
+      defaultExpectedStatus: HttpStatusCode.OK_200
+    })
+  }
+}
diff --git a/shared/server-commands/videos/video-passwords-command.ts b/shared/server-commands/videos/video-passwords-command.ts
new file mode 100644
index 000000000..bf10335b4
--- /dev/null
+++ b/shared/server-commands/videos/video-passwords-command.ts
@@ -0,0 +1,55 @@
+import { HttpStatusCode, ResultList, VideoPassword } from '@shared/models'
+import { AbstractCommand, OverrideCommandOptions } from '../shared'
+export class VideoPasswordsCommand extends AbstractCommand {
+
+  list (options: OverrideCommandOptions & {
+    videoId: number | string
+    start?: number
+    count?: number
+    sort?: string
+  }) {
+    const { start, count, sort, videoId } = options
+    const path = '/api/v1/videos/' + videoId + '/passwords'
+
+    return this.getRequestBody<ResultList<VideoPassword>>({
+      ...options,
+
+      path,
+      query: { start, count, sort },
+      implicitToken: true,
+      defaultExpectedStatus: HttpStatusCode.OK_200
+    })
+  }
+
+  updateAll (options: OverrideCommandOptions & {
+    videoId: number | string
+    passwords: string[]
+  }) {
+    const { videoId, passwords } = options
+    const path = `/api/v1/videos/${videoId}/passwords`
+
+    return this.putBodyRequest({
+      ...options,
+      path,
+      fields: { passwords },
+      implicitToken: true,
+      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
+    })
+  }
+
+  remove (options: OverrideCommandOptions & {
+    id: number
+    videoId: number | string
+  }) {
+    const { id, videoId } = options
+    const path = `/api/v1/videos/${videoId}/passwords/${id}`
+
+    return this.deleteRequest({
+      ...options,
+
+      path,
+      implicitToken: true,
+      defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
+    })
+  }
+}
diff --git a/shared/server-commands/videos/video-studio-command.ts b/shared/server-commands/videos/video-studio-command.ts
index 9fe467cc2..675cd84b7 100644
--- a/shared/server-commands/videos/video-studio-command.ts
+++ b/shared/server-commands/videos/video-studio-command.ts
@@ -25,7 +25,7 @@ export class VideoStudioCommand extends AbstractCommand {
       {
         name: 'add-watermark',
         options: {
-          file: 'thumbnail.png'
+          file: 'custom-thumbnail.png'
         }
       },
 
diff --git a/shared/server-commands/videos/video-token-command.ts b/shared/server-commands/videos/video-token-command.ts
index 0531bee65..c4ed29a8c 100644
--- a/shared/server-commands/videos/video-token-command.ts
+++ b/shared/server-commands/videos/video-token-command.ts
@@ -8,12 +8,14 @@ export class VideoTokenCommand extends AbstractCommand {
 
   create (options: OverrideCommandOptions & {
     videoId: number | string
+    videoPassword?: string
   }) {
-    const { videoId } = options
+    const { videoId, videoPassword } = options
     const path = '/api/v1/videos/' + videoId + '/token'
 
     return unwrapBody<VideoToken>(this.postBodyRequest({
       ...options,
+      headers: this.buildVideoPasswordHeader(videoPassword),
 
       path,
       implicitToken: true,
@@ -23,6 +25,7 @@ export class VideoTokenCommand extends AbstractCommand {
 
   async getVideoFileToken (options: OverrideCommandOptions & {
     videoId: number | string
+    videoPassword?: string
   }) {
     const { files } = await this.create(options)
 
diff --git a/shared/server-commands/videos/videos-command.ts b/shared/server-commands/videos/videos-command.ts
index b5df9c325..9602fa7da 100644
--- a/shared/server-commands/videos/videos-command.ts
+++ b/shared/server-commands/videos/videos-command.ts
@@ -111,8 +111,9 @@ export class VideosCommand extends AbstractCommand {
   rate (options: OverrideCommandOptions & {
     id: number | string
     rating: UserVideoRateType
+    videoPassword?: string
   }) {
-    const { id, rating } = options
+    const { id, rating, videoPassword } = options
     const path = '/api/v1/videos/' + id + '/rate'
 
     return this.putBodyRequest({
@@ -120,6 +121,7 @@ export class VideosCommand extends AbstractCommand {
 
       path,
       fields: { rating },
+      headers: this.buildVideoPasswordHeader(videoPassword),
       implicitToken: true,
       defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
     })
@@ -151,6 +153,23 @@ export class VideosCommand extends AbstractCommand {
     })
   }
 
+  getWithPassword (options: OverrideCommandOptions & {
+    id: number | string
+    password?: string
+  }) {
+    const path = '/api/v1/videos/' + options.id
+
+    return this.getRequestBody<VideoDetails>({
+      ...options,
+      headers:{
+        'x-peertube-video-password': options.password
+      },
+      path,
+      implicitToken: false,
+      defaultExpectedStatus: HttpStatusCode.OK_200
+    })
+  }
+
   getSource (options: OverrideCommandOptions & {
     id: number | string
   }) {
@@ -608,11 +627,13 @@ export class VideosCommand extends AbstractCommand {
     nsfw?: boolean
     privacy?: VideoPrivacy
     fixture?: string
+    videoPasswords?: string[]
   }) {
     const attributes: VideoEdit = { name: options.name }
     if (options.nsfw) attributes.nsfw = options.nsfw
     if (options.privacy) attributes.privacy = options.privacy
     if (options.fixture) attributes.fixture = options.fixture
+    if (options.videoPasswords) attributes.videoPasswords = options.videoPasswords
 
     return this.upload({ ...options, attributes })
   }
@@ -665,10 +686,10 @@ export class VideosCommand extends AbstractCommand {
     })
   }
 
-  removeAllWebTorrentFiles (options: OverrideCommandOptions & {
+  removeAllWebVideoFiles (options: OverrideCommandOptions & {
     videoId: number | string
   }) {
-    const path = '/api/v1/videos/' + options.videoId + '/webtorrent'
+    const path = '/api/v1/videos/' + options.videoId + '/web-videos'
 
     return this.deleteRequest({
       ...options,
@@ -679,11 +700,11 @@ export class VideosCommand extends AbstractCommand {
     })
   }
 
-  removeWebTorrentFile (options: OverrideCommandOptions & {
+  removeWebVideoFile (options: OverrideCommandOptions & {
     videoId: number | string
     fileId: number
   }) {
-    const path = '/api/v1/videos/' + options.videoId + '/webtorrent/' + options.fileId
+    const path = '/api/v1/videos/' + options.videoId + '/web-videos/' + options.fileId
 
     return this.deleteRequest({
       ...options,
@@ -696,7 +717,7 @@ export class VideosCommand extends AbstractCommand {
 
   runTranscoding (options: OverrideCommandOptions & {
     videoId: number | string
-    transcodingType: 'hls' | 'webtorrent'
+    transcodingType: 'hls' | 'webtorrent' | 'web-video'
   }) {
     const path = '/api/v1/videos/' + options.videoId + '/transcoding'