From 8ef9457fdee7812b1a8cc3b3bdeff94130819003 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 6 Jul 2021 10:36:54 +0200
Subject: Correctly export misc files

---
 shared/extra-utils/miscs/email.ts | 64 ---------------------------------------
 shared/extra-utils/miscs/index.ts |  3 ++
 2 files changed, 3 insertions(+), 64 deletions(-)
 delete mode 100644 shared/extra-utils/miscs/email.ts
 create mode 100644 shared/extra-utils/miscs/index.ts

(limited to 'shared/extra-utils/miscs')

diff --git a/shared/extra-utils/miscs/email.ts b/shared/extra-utils/miscs/email.ts
deleted file mode 100644
index 9fc9a5ad0..000000000
--- a/shared/extra-utils/miscs/email.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { ChildProcess } from 'child_process'
-import { randomInt } from '../../core-utils/miscs/miscs'
-import { parallelTests } from '../server/servers'
-
-const MailDev = require('maildev')
-
-class MockSmtpServer {
-
-  private static instance: MockSmtpServer
-  private started = false
-  private emailChildProcess: ChildProcess
-  private emails: object[]
-
-  private constructor () { }
-
-  collectEmails (emailsCollection: object[]) {
-    return new Promise<number>((res, rej) => {
-      const port = parallelTests() ? randomInt(1000, 2000) : 1025
-      this.emails = emailsCollection
-
-      if (this.started) {
-        return res(undefined)
-      }
-
-      const maildev = new MailDev({
-        ip: '127.0.0.1',
-        smtp: port,
-        disableWeb: true,
-        silent: true
-      })
-
-      maildev.on('new', email => {
-        this.emails.push(email)
-      })
-
-      maildev.listen(err => {
-        if (err) return rej(err)
-
-        this.started = true
-
-        return res(port)
-      })
-    })
-  }
-
-  kill () {
-    if (!this.emailChildProcess) return
-
-    process.kill(this.emailChildProcess.pid)
-
-    this.emailChildProcess = null
-    MockSmtpServer.instance = null
-  }
-
-  static get Instance () {
-    return this.instance || (this.instance = new this())
-  }
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  MockSmtpServer
-}
diff --git a/shared/extra-utils/miscs/index.ts b/shared/extra-utils/miscs/index.ts
new file mode 100644
index 000000000..ccacd4c79
--- /dev/null
+++ b/shared/extra-utils/miscs/index.ts
@@ -0,0 +1,3 @@
+export * from './miscs'
+export * from './sql'
+export * from './stubs'
-- 
cgit v1.2.3


From 9293139fde7091e9badcafa9b570b83cea9a10ad Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 9 Jul 2021 15:37:43 +0200
Subject: Introduce sql command

---
 shared/extra-utils/miscs/index.ts       |   2 +-
 shared/extra-utils/miscs/sql-command.ts | 142 ++++++++++++++++++++++++++++
 shared/extra-utils/miscs/sql.ts         | 161 --------------------------------
 shared/extra-utils/miscs/stubs.ts       |   7 --
 4 files changed, 143 insertions(+), 169 deletions(-)
 create mode 100644 shared/extra-utils/miscs/sql-command.ts
 delete mode 100644 shared/extra-utils/miscs/sql.ts

(limited to 'shared/extra-utils/miscs')

diff --git a/shared/extra-utils/miscs/index.ts b/shared/extra-utils/miscs/index.ts
index ccacd4c79..7e236c329 100644
--- a/shared/extra-utils/miscs/index.ts
+++ b/shared/extra-utils/miscs/index.ts
@@ -1,3 +1,3 @@
 export * from './miscs'
-export * from './sql'
+export * from './sql-command'
 export * from './stubs'
diff --git a/shared/extra-utils/miscs/sql-command.ts b/shared/extra-utils/miscs/sql-command.ts
new file mode 100644
index 000000000..2a3e9e607
--- /dev/null
+++ b/shared/extra-utils/miscs/sql-command.ts
@@ -0,0 +1,142 @@
+import { QueryTypes, Sequelize } from 'sequelize'
+import { AbstractCommand } from '../shared'
+
+export class SQLCommand extends AbstractCommand {
+  private sequelize: Sequelize
+
+  deleteAll (table: string) {
+    const seq = this.getSequelize()
+
+    const options = { type: QueryTypes.DELETE }
+
+    return seq.query(`DELETE FROM "${table}"`, options)
+  }
+
+  async getCount (table: string) {
+    const seq = this.getSequelize()
+
+    const options = { type: QueryTypes.SELECT as QueryTypes.SELECT }
+
+    const [ { total } ] = await seq.query<{ total: string }>(`SELECT COUNT(*) as total FROM "${table}"`, options)
+    if (total === null) return 0
+
+    return parseInt(total, 10)
+  }
+
+  setActorField (to: string, field: string, value: string) {
+    const seq = this.getSequelize()
+
+    const options = { type: QueryTypes.UPDATE }
+
+    return seq.query(`UPDATE actor SET "${field}" = '${value}' WHERE url = '${to}'`, options)
+  }
+
+  setVideoField (uuid: string, field: string, value: string) {
+    const seq = this.getSequelize()
+
+    const options = { type: QueryTypes.UPDATE }
+
+    return seq.query(`UPDATE video SET "${field}" = '${value}' WHERE uuid = '${uuid}'`, options)
+  }
+
+  setPlaylistField (uuid: string, field: string, value: string) {
+    const seq = this.getSequelize()
+
+    const options = { type: QueryTypes.UPDATE }
+
+    return seq.query(`UPDATE "videoPlaylist" SET "${field}" = '${value}' WHERE uuid = '${uuid}'`, options)
+  }
+
+  async countVideoViewsOf (uuid: string) {
+    const seq = this.getSequelize()
+
+    // tslint:disable
+    const query = 'SELECT SUM("videoView"."views") AS "total" FROM "videoView" ' +
+      `INNER JOIN "video" ON "video"."id" = "videoView"."videoId" WHERE "video"."uuid" = '${uuid}'`
+
+    const options = { type: QueryTypes.SELECT as QueryTypes.SELECT }
+    const [ { total } ] = await seq.query<{ total: number }>(query, options)
+
+    if (!total) return 0
+
+    return parseInt(total + '', 10)
+  }
+
+  getActorImage (filename: string) {
+    return this.selectQuery(`SELECT * FROM "actorImage" WHERE filename = '${filename}'`)
+      .then(rows => rows[0])
+  }
+
+  selectQuery (query: string) {
+    const seq = this.getSequelize()
+    const options = { type: QueryTypes.SELECT as QueryTypes.SELECT }
+
+    return seq.query<any>(query, options)
+  }
+
+  updateQuery (query: string) {
+    const seq = this.getSequelize()
+    const options = { type: QueryTypes.UPDATE as QueryTypes.UPDATE }
+
+    return seq.query(query, options)
+  }
+
+  setPluginField (pluginName: string, field: string, value: string) {
+    const seq = this.getSequelize()
+
+    const options = { type: QueryTypes.UPDATE }
+
+    return seq.query(`UPDATE "plugin" SET "${field}" = '${value}' WHERE "name" = '${pluginName}'`, options)
+  }
+
+  setPluginVersion (pluginName: string, newVersion: string) {
+    return this.setPluginField(pluginName, 'version', newVersion)
+  }
+
+  setPluginLatestVersion (pluginName: string, newVersion: string) {
+    return this.setPluginField(pluginName, 'latestVersion', newVersion)
+  }
+
+  setActorFollowScores (newScore: number) {
+    const seq = this.getSequelize()
+
+    const options = { type: QueryTypes.UPDATE }
+
+    return seq.query(`UPDATE "actorFollow" SET "score" = ${newScore}`, options)
+  }
+
+  setTokenField (accessToken: string, field: string, value: string) {
+    const seq = this.getSequelize()
+
+    const options = { type: QueryTypes.UPDATE }
+
+    return seq.query(`UPDATE "oAuthToken" SET "${field}" = '${value}' WHERE "accessToken" = '${accessToken}'`, options)
+  }
+
+  async cleanup () {
+    if (!this.sequelize) return
+
+    await this.sequelize.close()
+    this.sequelize = undefined
+  }
+
+  private getSequelize () {
+    if (this.sequelize) return this.sequelize
+
+    const dbname = 'peertube_test' + this.server.internalServerNumber
+    const username = 'peertube'
+    const password = 'peertube'
+    const host = 'localhost'
+    const port = 5432
+
+    this.sequelize = new Sequelize(dbname, username, password, {
+      dialect: 'postgres',
+      host,
+      port,
+      logging: false
+    })
+
+    return this.sequelize
+  }
+
+}
diff --git a/shared/extra-utils/miscs/sql.ts b/shared/extra-utils/miscs/sql.ts
deleted file mode 100644
index 65a0aa5fe..000000000
--- a/shared/extra-utils/miscs/sql.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-import { QueryTypes, Sequelize } from 'sequelize'
-import { ServerInfo } from '../server/servers'
-
-const sequelizes: { [ id: number ]: Sequelize } = {}
-
-function getSequelize (internalServerNumber: number) {
-  if (sequelizes[internalServerNumber]) return sequelizes[internalServerNumber]
-
-  const dbname = 'peertube_test' + internalServerNumber
-  const username = 'peertube'
-  const password = 'peertube'
-  const host = 'localhost'
-  const port = 5432
-
-  const seq = new Sequelize(dbname, username, password, {
-    dialect: 'postgres',
-    host,
-    port,
-    logging: false
-  })
-
-  sequelizes[internalServerNumber] = seq
-
-  return seq
-}
-
-function deleteAll (internalServerNumber: number, table: string) {
-  const seq = getSequelize(internalServerNumber)
-
-  const options = { type: QueryTypes.DELETE }
-
-  return seq.query(`DELETE FROM "${table}"`, options)
-}
-
-async function getCount (internalServerNumber: number, table: string) {
-  const seq = getSequelize(internalServerNumber)
-
-  const options = { type: QueryTypes.SELECT as QueryTypes.SELECT }
-
-  const [ { total } ] = await seq.query<{ total: string }>(`SELECT COUNT(*) as total FROM "${table}"`, options)
-  if (total === null) return 0
-
-  return parseInt(total, 10)
-}
-
-function setActorField (internalServerNumber: number, to: string, field: string, value: string) {
-  const seq = getSequelize(internalServerNumber)
-
-  const options = { type: QueryTypes.UPDATE }
-
-  return seq.query(`UPDATE actor SET "${field}" = '${value}' WHERE url = '${to}'`, options)
-}
-
-function setVideoField (internalServerNumber: number, uuid: string, field: string, value: string) {
-  const seq = getSequelize(internalServerNumber)
-
-  const options = { type: QueryTypes.UPDATE }
-
-  return seq.query(`UPDATE video SET "${field}" = '${value}' WHERE uuid = '${uuid}'`, options)
-}
-
-function setPlaylistField (internalServerNumber: number, uuid: string, field: string, value: string) {
-  const seq = getSequelize(internalServerNumber)
-
-  const options = { type: QueryTypes.UPDATE }
-
-  return seq.query(`UPDATE "videoPlaylist" SET "${field}" = '${value}' WHERE uuid = '${uuid}'`, options)
-}
-
-async function countVideoViewsOf (internalServerNumber: number, uuid: string) {
-  const seq = getSequelize(internalServerNumber)
-
-  // tslint:disable
-  const query = 'SELECT SUM("videoView"."views") AS "total" FROM "videoView" ' +
-    `INNER JOIN "video" ON "video"."id" = "videoView"."videoId" WHERE "video"."uuid" = '${uuid}'`
-
-  const options = { type: QueryTypes.SELECT as QueryTypes.SELECT }
-  const [ { total } ] = await seq.query<{ total: number }>(query, options)
-
-  if (!total) return 0
-
-  return parseInt(total + '', 10)
-}
-
-function getActorImage (internalServerNumber: number, filename: string) {
-  return selectQuery(internalServerNumber, `SELECT * FROM "actorImage" WHERE filename = '${filename}'`)
-    .then(rows => rows[0])
-}
-
-function selectQuery (internalServerNumber: number, query: string) {
-  const seq = getSequelize(internalServerNumber)
-  const options = { type: QueryTypes.SELECT as QueryTypes.SELECT }
-
-  return seq.query<any>(query, options)
-}
-
-function updateQuery (internalServerNumber: number, query: string) {
-  const seq = getSequelize(internalServerNumber)
-  const options = { type: QueryTypes.UPDATE as QueryTypes.UPDATE }
-
-  return seq.query(query, options)
-}
-
-async function closeAllSequelize (servers: ServerInfo[]) {
-  for (const server of servers) {
-    if (sequelizes[server.internalServerNumber]) {
-      await sequelizes[server.internalServerNumber].close()
-      // eslint-disable-next-line
-      delete sequelizes[server.internalServerNumber]
-    }
-  }
-}
-
-function setPluginField (internalServerNumber: number, pluginName: string, field: string, value: string) {
-  const seq = getSequelize(internalServerNumber)
-
-  const options = { type: QueryTypes.UPDATE }
-
-  return seq.query(`UPDATE "plugin" SET "${field}" = '${value}' WHERE "name" = '${pluginName}'`, options)
-}
-
-function setPluginVersion (internalServerNumber: number, pluginName: string, newVersion: string) {
-  return setPluginField(internalServerNumber, pluginName, 'version', newVersion)
-}
-
-function setPluginLatestVersion (internalServerNumber: number, pluginName: string, newVersion: string) {
-  return setPluginField(internalServerNumber, pluginName, 'latestVersion', newVersion)
-}
-
-function setActorFollowScores (internalServerNumber: number, newScore: number) {
-  const seq = getSequelize(internalServerNumber)
-
-  const options = { type: QueryTypes.UPDATE }
-
-  return seq.query(`UPDATE "actorFollow" SET "score" = ${newScore}`, options)
-}
-
-function setTokenField (internalServerNumber: number, accessToken: string, field: string, value: string) {
-  const seq = getSequelize(internalServerNumber)
-
-  const options = { type: QueryTypes.UPDATE }
-
-  return seq.query(`UPDATE "oAuthToken" SET "${field}" = '${value}' WHERE "accessToken" = '${accessToken}'`, options)
-}
-
-export {
-  setVideoField,
-  setPlaylistField,
-  setActorField,
-  countVideoViewsOf,
-  setPluginVersion,
-  setPluginLatestVersion,
-  selectQuery,
-  getActorImage,
-  deleteAll,
-  setTokenField,
-  updateQuery,
-  setActorFollowScores,
-  closeAllSequelize,
-  getCount
-}
diff --git a/shared/extra-utils/miscs/stubs.ts b/shared/extra-utils/miscs/stubs.ts
index d1eb0e3b2..940e4bf29 100644
--- a/shared/extra-utils/miscs/stubs.ts
+++ b/shared/extra-utils/miscs/stubs.ts
@@ -2,13 +2,6 @@ function buildRequestStub (): any {
   return { }
 }
 
-function buildResponseStub (): any {
-  return {
-    locals: {}
-  }
-}
-
 export {
-  buildResponseStub,
   buildRequestStub
 }
-- 
cgit v1.2.3


From 6c5065a011b099618681a37bd77eaa7bd3db752e Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 13 Jul 2021 09:43:59 +0200
Subject: Introduce server commands

---
 shared/extra-utils/miscs/checks.ts      |  46 +++++++++
 shared/extra-utils/miscs/generate.ts    |  61 ++++++++++++
 shared/extra-utils/miscs/index.ts       |   6 +-
 shared/extra-utils/miscs/miscs.ts       | 170 --------------------------------
 shared/extra-utils/miscs/sql-command.ts |   2 +-
 shared/extra-utils/miscs/stubs.ts       |   7 --
 shared/extra-utils/miscs/tests.ts       |  62 ++++++++++++
 shared/extra-utils/miscs/webtorrent.ts  |  16 +++
 8 files changed, 190 insertions(+), 180 deletions(-)
 create mode 100644 shared/extra-utils/miscs/checks.ts
 create mode 100644 shared/extra-utils/miscs/generate.ts
 delete mode 100644 shared/extra-utils/miscs/miscs.ts
 delete mode 100644 shared/extra-utils/miscs/stubs.ts
 create mode 100644 shared/extra-utils/miscs/tests.ts
 create mode 100644 shared/extra-utils/miscs/webtorrent.ts

(limited to 'shared/extra-utils/miscs')

diff --git a/shared/extra-utils/miscs/checks.ts b/shared/extra-utils/miscs/checks.ts
new file mode 100644
index 000000000..86b861cd2
--- /dev/null
+++ b/shared/extra-utils/miscs/checks.ts
@@ -0,0 +1,46 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/no-floating-promises */
+
+import { expect } from 'chai'
+import { pathExists, readFile } from 'fs-extra'
+import { join } from 'path'
+import { root } from '@server/helpers/core-utils'
+import { HttpStatusCode } from '@shared/core-utils'
+import { makeGetRequest } from '../requests'
+import { ServerInfo } from '../server'
+
+// Default interval -> 5 minutes
+function dateIsValid (dateString: string, interval = 300000) {
+  const dateToCheck = new Date(dateString)
+  const now = new Date()
+
+  return Math.abs(now.getTime() - dateToCheck.getTime()) <= interval
+}
+
+async function testImage (url: string, imageName: string, imagePath: string, extension = '.jpg') {
+  const res = await makeGetRequest({
+    url,
+    path: imagePath,
+    statusCodeExpected: HttpStatusCode.OK_200
+  })
+
+  const body = res.body
+
+  const data = await readFile(join(root(), 'server', 'tests', 'fixtures', imageName + extension))
+  const minLength = body.length - ((30 * body.length) / 100)
+  const maxLength = body.length + ((30 * body.length) / 100)
+
+  expect(data.length).to.be.above(minLength, 'the generated image is way smaller than the recorded fixture')
+  expect(data.length).to.be.below(maxLength, 'the generated image is way larger than the recorded fixture')
+}
+
+async function testFileExistsOrNot (server: ServerInfo, directory: string, filePath: string, exist: boolean) {
+  const base = server.serversCommand.buildDirectory(directory)
+
+  expect(await pathExists(join(base, filePath))).to.equal(exist)
+}
+
+export {
+  dateIsValid,
+  testImage,
+  testFileExistsOrNot
+}
diff --git a/shared/extra-utils/miscs/generate.ts b/shared/extra-utils/miscs/generate.ts
new file mode 100644
index 000000000..4e70ab853
--- /dev/null
+++ b/shared/extra-utils/miscs/generate.ts
@@ -0,0 +1,61 @@
+import { ensureDir, pathExists } from 'fs-extra'
+import { dirname } from 'path'
+import { buildAbsoluteFixturePath } from './tests'
+import * as ffmpeg from 'fluent-ffmpeg'
+
+async function generateHighBitrateVideo () {
+  const tempFixturePath = buildAbsoluteFixturePath('video_high_bitrate_1080p.mp4', true)
+
+  await ensureDir(dirname(tempFixturePath))
+
+  const exists = await pathExists(tempFixturePath)
+  if (!exists) {
+    console.log('Generating high bitrate video.')
+
+    // Generate a random, high bitrate video on the fly, so we don't have to include
+    // a large file in the repo. The video needs to have a certain minimum length so
+    // that FFmpeg properly applies bitrate limits.
+    // https://stackoverflow.com/a/15795112
+    return new Promise<string>((res, rej) => {
+      ffmpeg()
+        .outputOptions([ '-f rawvideo', '-video_size 1920x1080', '-i /dev/urandom' ])
+        .outputOptions([ '-ac 2', '-f s16le', '-i /dev/urandom', '-t 10' ])
+        .outputOptions([ '-maxrate 10M', '-bufsize 10M' ])
+        .output(tempFixturePath)
+        .on('error', rej)
+        .on('end', () => res(tempFixturePath))
+        .run()
+    })
+  }
+
+  return tempFixturePath
+}
+
+async function generateVideoWithFramerate (fps = 60) {
+  const tempFixturePath = buildAbsoluteFixturePath(`video_${fps}fps.mp4`, true)
+
+  await ensureDir(dirname(tempFixturePath))
+
+  const exists = await pathExists(tempFixturePath)
+  if (!exists) {
+    console.log('Generating video with framerate %d.', fps)
+
+    return new Promise<string>((res, rej) => {
+      ffmpeg()
+        .outputOptions([ '-f rawvideo', '-video_size 1280x720', '-i /dev/urandom' ])
+        .outputOptions([ '-ac 2', '-f s16le', '-i /dev/urandom', '-t 10' ])
+        .outputOptions([ `-r ${fps}` ])
+        .output(tempFixturePath)
+        .on('error', rej)
+        .on('end', () => res(tempFixturePath))
+        .run()
+    })
+  }
+
+  return tempFixturePath
+}
+
+export {
+  generateHighBitrateVideo,
+  generateVideoWithFramerate
+}
diff --git a/shared/extra-utils/miscs/index.ts b/shared/extra-utils/miscs/index.ts
index 7e236c329..4474661de 100644
--- a/shared/extra-utils/miscs/index.ts
+++ b/shared/extra-utils/miscs/index.ts
@@ -1,3 +1,5 @@
-export * from './miscs'
+export * from './checks'
+export * from './generate'
 export * from './sql-command'
-export * from './stubs'
+export * from './tests'
+export * from './webtorrent'
diff --git a/shared/extra-utils/miscs/miscs.ts b/shared/extra-utils/miscs/miscs.ts
deleted file mode 100644
index 462b914d4..000000000
--- a/shared/extra-utils/miscs/miscs.ts
+++ /dev/null
@@ -1,170 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-
-import * as chai from 'chai'
-import * as ffmpeg from 'fluent-ffmpeg'
-import { ensureDir, pathExists, readFile, stat } from 'fs-extra'
-import { basename, dirname, isAbsolute, join, resolve } from 'path'
-import * as request from 'supertest'
-import * as WebTorrent from 'webtorrent'
-import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
-
-const expect = chai.expect
-let webtorrent: WebTorrent.Instance
-
-function immutableAssign<T, U> (target: T, source: U) {
-  return Object.assign<{}, T, U>({}, target, source)
-}
-
-// Default interval -> 5 minutes
-function dateIsValid (dateString: string, interval = 300000) {
-  const dateToCheck = new Date(dateString)
-  const now = new Date()
-
-  return Math.abs(now.getTime() - dateToCheck.getTime()) <= interval
-}
-
-function wait (milliseconds: number) {
-  return new Promise(resolve => setTimeout(resolve, milliseconds))
-}
-
-function webtorrentAdd (torrent: string, refreshWebTorrent = false) {
-  const WebTorrent = require('webtorrent')
-
-  if (!webtorrent) webtorrent = new WebTorrent()
-  if (refreshWebTorrent === true) webtorrent = new WebTorrent()
-
-  return new Promise<WebTorrent.Torrent>(res => webtorrent.add(torrent, res))
-}
-
-function root () {
-  // We are in /miscs
-  let root = join(__dirname, '..', '..', '..')
-
-  if (basename(root) === 'dist') root = resolve(root, '..')
-
-  return root
-}
-
-function buildServerDirectory (server: { internalServerNumber: number }, directory: string) {
-  return join(root(), 'test' + server.internalServerNumber, directory)
-}
-
-async function testImage (url: string, imageName: string, imagePath: string, extension = '.jpg') {
-  const res = await request(url)
-    .get(imagePath)
-    .expect(HttpStatusCode.OK_200)
-
-  const body = res.body
-
-  const data = await readFile(join(root(), 'server', 'tests', 'fixtures', imageName + extension))
-  const minLength = body.length - ((30 * body.length) / 100)
-  const maxLength = body.length + ((30 * body.length) / 100)
-
-  expect(data.length).to.be.above(minLength, 'the generated image is way smaller than the recorded fixture')
-  expect(data.length).to.be.below(maxLength, 'the generated image is way larger than the recorded fixture')
-}
-
-async function testFileExistsOrNot (server: { internalServerNumber: number }, directory: string, filePath: string, exist: boolean) {
-  const base = buildServerDirectory(server, directory)
-
-  expect(await pathExists(join(base, filePath))).to.equal(exist)
-}
-
-function isGithubCI () {
-  return !!process.env.GITHUB_WORKSPACE
-}
-
-function buildAbsoluteFixturePath (path: string, customCIPath = false) {
-  if (isAbsolute(path)) return path
-
-  if (customCIPath && process.env.GITHUB_WORKSPACE) {
-    return join(process.env.GITHUB_WORKSPACE, 'fixtures', path)
-  }
-
-  return join(root(), 'server', 'tests', 'fixtures', path)
-}
-
-function areHttpImportTestsDisabled () {
-  const disabled = process.env.DISABLE_HTTP_IMPORT_TESTS === 'true'
-
-  if (disabled) console.log('Import tests are disabled')
-
-  return disabled
-}
-
-async function generateHighBitrateVideo () {
-  const tempFixturePath = buildAbsoluteFixturePath('video_high_bitrate_1080p.mp4', true)
-
-  await ensureDir(dirname(tempFixturePath))
-
-  const exists = await pathExists(tempFixturePath)
-  if (!exists) {
-    console.log('Generating high bitrate video.')
-
-    // Generate a random, high bitrate video on the fly, so we don't have to include
-    // a large file in the repo. The video needs to have a certain minimum length so
-    // that FFmpeg properly applies bitrate limits.
-    // https://stackoverflow.com/a/15795112
-    return new Promise<string>((res, rej) => {
-      ffmpeg()
-        .outputOptions([ '-f rawvideo', '-video_size 1920x1080', '-i /dev/urandom' ])
-        .outputOptions([ '-ac 2', '-f s16le', '-i /dev/urandom', '-t 10' ])
-        .outputOptions([ '-maxrate 10M', '-bufsize 10M' ])
-        .output(tempFixturePath)
-        .on('error', rej)
-        .on('end', () => res(tempFixturePath))
-        .run()
-    })
-  }
-
-  return tempFixturePath
-}
-
-async function generateVideoWithFramerate (fps = 60) {
-  const tempFixturePath = buildAbsoluteFixturePath(`video_${fps}fps.mp4`, true)
-
-  await ensureDir(dirname(tempFixturePath))
-
-  const exists = await pathExists(tempFixturePath)
-  if (!exists) {
-    console.log('Generating video with framerate %d.', fps)
-
-    return new Promise<string>((res, rej) => {
-      ffmpeg()
-        .outputOptions([ '-f rawvideo', '-video_size 1280x720', '-i /dev/urandom' ])
-        .outputOptions([ '-ac 2', '-f s16le', '-i /dev/urandom', '-t 10' ])
-        .outputOptions([ `-r ${fps}` ])
-        .output(tempFixturePath)
-        .on('error', rej)
-        .on('end', () => res(tempFixturePath))
-        .run()
-    })
-  }
-
-  return tempFixturePath
-}
-
-async function getFileSize (path: string) {
-  const stats = await stat(path)
-
-  return stats.size
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  dateIsValid,
-  wait,
-  areHttpImportTestsDisabled,
-  buildServerDirectory,
-  webtorrentAdd,
-  getFileSize,
-  immutableAssign,
-  testImage,
-  isGithubCI,
-  buildAbsoluteFixturePath,
-  testFileExistsOrNot,
-  root,
-  generateHighBitrateVideo,
-  generateVideoWithFramerate
-}
diff --git a/shared/extra-utils/miscs/sql-command.ts b/shared/extra-utils/miscs/sql-command.ts
index 2a3e9e607..80c8cd271 100644
--- a/shared/extra-utils/miscs/sql-command.ts
+++ b/shared/extra-utils/miscs/sql-command.ts
@@ -1,5 +1,5 @@
 import { QueryTypes, Sequelize } from 'sequelize'
-import { AbstractCommand } from '../shared'
+import { AbstractCommand } from '../shared/abstract-command'
 
 export class SQLCommand extends AbstractCommand {
   private sequelize: Sequelize
diff --git a/shared/extra-utils/miscs/stubs.ts b/shared/extra-utils/miscs/stubs.ts
deleted file mode 100644
index 940e4bf29..000000000
--- a/shared/extra-utils/miscs/stubs.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-function buildRequestStub (): any {
-  return { }
-}
-
-export {
-  buildRequestStub
-}
diff --git a/shared/extra-utils/miscs/tests.ts b/shared/extra-utils/miscs/tests.ts
new file mode 100644
index 000000000..8f7a2f92b
--- /dev/null
+++ b/shared/extra-utils/miscs/tests.ts
@@ -0,0 +1,62 @@
+import { stat } from 'fs-extra'
+import { basename, isAbsolute, join, resolve } from 'path'
+
+function parallelTests () {
+  return process.env.MOCHA_PARALLEL === 'true'
+}
+
+function isGithubCI () {
+  return !!process.env.GITHUB_WORKSPACE
+}
+
+function areHttpImportTestsDisabled () {
+  const disabled = process.env.DISABLE_HTTP_IMPORT_TESTS === 'true'
+
+  if (disabled) console.log('Import tests are disabled')
+
+  return disabled
+}
+
+function buildAbsoluteFixturePath (path: string, customCIPath = false) {
+  if (isAbsolute(path)) return path
+
+  if (customCIPath && process.env.GITHUB_WORKSPACE) {
+    return join(process.env.GITHUB_WORKSPACE, 'fixtures', path)
+  }
+
+  return join(root(), 'server', 'tests', 'fixtures', path)
+}
+
+function root () {
+  // We are in /miscs
+  let root = join(__dirname, '..', '..', '..')
+
+  if (basename(root) === 'dist') root = resolve(root, '..')
+
+  return root
+}
+
+function wait (milliseconds: number) {
+  return new Promise(resolve => setTimeout(resolve, milliseconds))
+}
+
+async function getFileSize (path: string) {
+  const stats = await stat(path)
+
+  return stats.size
+}
+
+function buildRequestStub (): any {
+  return { }
+}
+
+export {
+  parallelTests,
+  isGithubCI,
+  areHttpImportTestsDisabled,
+  buildAbsoluteFixturePath,
+  getFileSize,
+  buildRequestStub,
+  wait,
+  root
+}
diff --git a/shared/extra-utils/miscs/webtorrent.ts b/shared/extra-utils/miscs/webtorrent.ts
new file mode 100644
index 000000000..82548946d
--- /dev/null
+++ b/shared/extra-utils/miscs/webtorrent.ts
@@ -0,0 +1,16 @@
+import * as WebTorrent from 'webtorrent'
+
+let webtorrent: WebTorrent.Instance
+
+function webtorrentAdd (torrent: string, refreshWebTorrent = false) {
+  const WebTorrent = require('webtorrent')
+
+  if (!webtorrent) webtorrent = new WebTorrent()
+  if (refreshWebTorrent === true) webtorrent = new WebTorrent()
+
+  return new Promise<WebTorrent.Torrent>(res => webtorrent.add(torrent, res))
+}
+
+export {
+  webtorrentAdd
+}
-- 
cgit v1.2.3


From d23dd9fbfc4d26026352c10f81d2795ceaf2908a Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 15 Jul 2021 10:02:54 +0200
Subject: Introduce videos command

---
 shared/extra-utils/miscs/webtorrent.ts | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'shared/extra-utils/miscs')

diff --git a/shared/extra-utils/miscs/webtorrent.ts b/shared/extra-utils/miscs/webtorrent.ts
index 82548946d..63e648309 100644
--- a/shared/extra-utils/miscs/webtorrent.ts
+++ b/shared/extra-utils/miscs/webtorrent.ts
@@ -1,4 +1,8 @@
+import { readFile } from 'fs-extra'
+import * as parseTorrent from 'parse-torrent'
+import { join } from 'path'
 import * as WebTorrent from 'webtorrent'
+import { ServerInfo } from '../server'
 
 let webtorrent: WebTorrent.Instance
 
@@ -11,6 +15,16 @@ function webtorrentAdd (torrent: string, refreshWebTorrent = false) {
   return new Promise<WebTorrent.Torrent>(res => webtorrent.add(torrent, res))
 }
 
+async function parseTorrentVideo (server: ServerInfo, videoUUID: string, resolution: number) {
+  const torrentName = videoUUID + '-' + resolution + '.torrent'
+  const torrentPath = server.serversCommand.buildDirectory(join('torrents', torrentName))
+
+  const data = await readFile(torrentPath)
+
+  return parseTorrent(data)
+}
+
 export {
-  webtorrentAdd
+  webtorrentAdd,
+  parseTorrentVideo
 }
-- 
cgit v1.2.3


From 89d241a79c262b9775c233b73cff080043ebb5e6 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 16 Jul 2021 09:04:35 +0200
Subject: Shorter server command names

---
 shared/extra-utils/miscs/checks.ts     | 2 +-
 shared/extra-utils/miscs/webtorrent.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'shared/extra-utils/miscs')

diff --git a/shared/extra-utils/miscs/checks.ts b/shared/extra-utils/miscs/checks.ts
index 86b861cd2..8f7bdb9b5 100644
--- a/shared/extra-utils/miscs/checks.ts
+++ b/shared/extra-utils/miscs/checks.ts
@@ -34,7 +34,7 @@ async function testImage (url: string, imageName: string, imagePath: string, ext
 }
 
 async function testFileExistsOrNot (server: ServerInfo, directory: string, filePath: string, exist: boolean) {
-  const base = server.serversCommand.buildDirectory(directory)
+  const base = server.servers.buildDirectory(directory)
 
   expect(await pathExists(join(base, filePath))).to.equal(exist)
 }
diff --git a/shared/extra-utils/miscs/webtorrent.ts b/shared/extra-utils/miscs/webtorrent.ts
index 63e648309..84e390b2a 100644
--- a/shared/extra-utils/miscs/webtorrent.ts
+++ b/shared/extra-utils/miscs/webtorrent.ts
@@ -17,7 +17,7 @@ function webtorrentAdd (torrent: string, refreshWebTorrent = false) {
 
 async function parseTorrentVideo (server: ServerInfo, videoUUID: string, resolution: number) {
   const torrentName = videoUUID + '-' + resolution + '.torrent'
-  const torrentPath = server.serversCommand.buildDirectory(join('torrents', torrentName))
+  const torrentPath = server.servers.buildDirectory(join('torrents', torrentName))
 
   const data = await readFile(torrentPath)
 
-- 
cgit v1.2.3


From 254d3579f5338f5fd775c17d15cdfc37078bcfb4 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 16 Jul 2021 09:47:51 +0200
Subject: Use an object to represent a server

---
 shared/extra-utils/miscs/checks.ts     | 4 ++--
 shared/extra-utils/miscs/webtorrent.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'shared/extra-utils/miscs')

diff --git a/shared/extra-utils/miscs/checks.ts b/shared/extra-utils/miscs/checks.ts
index 8f7bdb9b5..c81460330 100644
--- a/shared/extra-utils/miscs/checks.ts
+++ b/shared/extra-utils/miscs/checks.ts
@@ -6,7 +6,7 @@ import { join } from 'path'
 import { root } from '@server/helpers/core-utils'
 import { HttpStatusCode } from '@shared/core-utils'
 import { makeGetRequest } from '../requests'
-import { ServerInfo } from '../server'
+import { PeerTubeServer } from '../server'
 
 // Default interval -> 5 minutes
 function dateIsValid (dateString: string, interval = 300000) {
@@ -33,7 +33,7 @@ async function testImage (url: string, imageName: string, imagePath: string, ext
   expect(data.length).to.be.below(maxLength, 'the generated image is way larger than the recorded fixture')
 }
 
-async function testFileExistsOrNot (server: ServerInfo, directory: string, filePath: string, exist: boolean) {
+async function testFileExistsOrNot (server: PeerTubeServer, directory: string, filePath: string, exist: boolean) {
   const base = server.servers.buildDirectory(directory)
 
   expect(await pathExists(join(base, filePath))).to.equal(exist)
diff --git a/shared/extra-utils/miscs/webtorrent.ts b/shared/extra-utils/miscs/webtorrent.ts
index 84e390b2a..815ea3d56 100644
--- a/shared/extra-utils/miscs/webtorrent.ts
+++ b/shared/extra-utils/miscs/webtorrent.ts
@@ -2,7 +2,7 @@ import { readFile } from 'fs-extra'
 import * as parseTorrent from 'parse-torrent'
 import { join } from 'path'
 import * as WebTorrent from 'webtorrent'
-import { ServerInfo } from '../server'
+import { PeerTubeServer } from '../server'
 
 let webtorrent: WebTorrent.Instance
 
@@ -15,7 +15,7 @@ function webtorrentAdd (torrent: string, refreshWebTorrent = false) {
   return new Promise<WebTorrent.Torrent>(res => webtorrent.add(torrent, res))
 }
 
-async function parseTorrentVideo (server: ServerInfo, videoUUID: string, resolution: number) {
+async function parseTorrentVideo (server: PeerTubeServer, videoUUID: string, resolution: number) {
   const torrentName = videoUUID + '-' + resolution + '.torrent'
   const torrentPath = server.servers.buildDirectory(join('torrents', torrentName))
 
-- 
cgit v1.2.3


From 59bbcced37005dd511daca9bd58ae2998cb931b1 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 16 Jul 2021 10:19:16 +0200
Subject: Centralize test URLs

---
 shared/extra-utils/miscs/tests.ts | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'shared/extra-utils/miscs')

diff --git a/shared/extra-utils/miscs/tests.ts b/shared/extra-utils/miscs/tests.ts
index 8f7a2f92b..3dfb2487e 100644
--- a/shared/extra-utils/miscs/tests.ts
+++ b/shared/extra-utils/miscs/tests.ts
@@ -1,6 +1,36 @@
 import { stat } from 'fs-extra'
 import { basename, isAbsolute, join, resolve } from 'path'
 
+const FIXTURE_URLS = {
+  youtube: 'https://www.youtube.com/watch?v=msX3jv1XdvM',
+
+  /**
+   * The video is used to check format-selection correctness wrt. HDR,
+   * which brings its own set of oddities outside of a MediaSource.
+   * FIXME: refactor once HDR is supported at playback
+   *
+   * The video needs to have the following format_ids:
+   * (which you can check by using `youtube-dl <url> -F`):
+   * - 303 (1080p webm vp9)
+   * - 299 (1080p mp4 avc1)
+   * - 335 (1080p webm vp9.2 HDR)
+   *
+   * 15 jan. 2021: TEST VIDEO NOT CURRENTLY PROVIDING
+   * - 400 (1080p mp4 av01)
+   * - 315 (2160p webm vp9 HDR)
+   * - 337 (2160p webm vp9.2 HDR)
+   * - 401 (2160p mp4 av01 HDR)
+   */
+  youtubeHDR: 'https://www.youtube.com/watch?v=qR5vOXbZsI4',
+
+  // eslint-disable-next-line max-len
+  magnet: 'magnet:?xs=https%3A%2F%2Fpeertube2.cpy.re%2Fstatic%2Ftorrents%2Fb209ca00-c8bb-4b2b-b421-1ede169f3dbc-720.torrent&xt=urn:btih:0f498834733e8057ed5c6f2ee2b4efd8d84a76ee&dn=super+peertube2+video&tr=wss%3A%2F%2Fpeertube2.cpy.re%3A443%2Ftracker%2Fsocket&tr=https%3A%2F%2Fpeertube2.cpy.re%2Ftracker%2Fannounce&ws=https%3A%2F%2Fpeertube2.cpy.re%2Fstatic%2Fwebseed%2Fb209ca00-c8bb-4b2b-b421-1ede169f3dbc-720.mp4',
+
+  badVideo: 'https://download.cpy.re/peertube/bad_video.mp4',
+  goodVideo: 'https://download.cpy.re/peertube/good_video.mp4',
+  video4K: 'https://download.cpy.re/peertube/4k_file.txt'
+}
+
 function parallelTests () {
   return process.env.MOCHA_PARALLEL === 'true'
 }
@@ -51,6 +81,8 @@ function buildRequestStub (): any {
 }
 
 export {
+  FIXTURE_URLS,
+
   parallelTests,
   isGithubCI,
   areHttpImportTestsDisabled,
-- 
cgit v1.2.3


From c0e8b12e7fd554ba4d2ceb0c4900804c6a4c63ea Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 16 Jul 2021 10:42:24 +0200
Subject: Refactor requests

---
 shared/extra-utils/miscs/checks.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'shared/extra-utils/miscs')

diff --git a/shared/extra-utils/miscs/checks.ts b/shared/extra-utils/miscs/checks.ts
index c81460330..7fc92f804 100644
--- a/shared/extra-utils/miscs/checks.ts
+++ b/shared/extra-utils/miscs/checks.ts
@@ -4,7 +4,7 @@ import { expect } from 'chai'
 import { pathExists, readFile } from 'fs-extra'
 import { join } from 'path'
 import { root } from '@server/helpers/core-utils'
-import { HttpStatusCode } from '@shared/core-utils'
+import { HttpStatusCode } from '@shared/models'
 import { makeGetRequest } from '../requests'
 import { PeerTubeServer } from '../server'
 
@@ -20,7 +20,7 @@ async function testImage (url: string, imageName: string, imagePath: string, ext
   const res = await makeGetRequest({
     url,
     path: imagePath,
-    statusCodeExpected: HttpStatusCode.OK_200
+    expectedStatus: HttpStatusCode.OK_200
   })
 
   const body = res.body
-- 
cgit v1.2.3


From 4c7e60bc17ee5830399bac4aa273356903421b4c Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 16 Jul 2021 14:27:30 +0200
Subject: Reorganize imports

---
 shared/extra-utils/miscs/generate.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'shared/extra-utils/miscs')

diff --git a/shared/extra-utils/miscs/generate.ts b/shared/extra-utils/miscs/generate.ts
index 4e70ab853..8d6435481 100644
--- a/shared/extra-utils/miscs/generate.ts
+++ b/shared/extra-utils/miscs/generate.ts
@@ -1,7 +1,7 @@
+import * as ffmpeg from 'fluent-ffmpeg'
 import { ensureDir, pathExists } from 'fs-extra'
 import { dirname } from 'path'
 import { buildAbsoluteFixturePath } from './tests'
-import * as ffmpeg from 'fluent-ffmpeg'
 
 async function generateHighBitrateVideo () {
   const tempFixturePath = buildAbsoluteFixturePath('video_high_bitrate_1080p.mp4', true)
-- 
cgit v1.2.3