5 files changed, 44 insertions, 15 deletions

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) {