mirror of
https://github.com/Chocobozzz/PeerTube.git
synced 2024-09-11 13:37:10 +03:00
chore(refactor): remove shared folder dependencies to the server
Many files from the `shared` folder were importing files from the `server` folder. When attempting to use Typescript project references to describe dependencies, it highlighted a circular dependency beetween `shared` <-> `server`. The Typescript project forbid such usages. Using project references greatly improve performance by rebuilding only the updated project and not all source files. > see https://www.typescriptlang.org/docs/handbook/project-references.html
This commit is contained in:
parent
854f533c12
commit
06aad80165
@ -102,6 +102,9 @@
|
|||||||
"parserOptions": {
|
"parserOptions": {
|
||||||
"project": [
|
"project": [
|
||||||
"./tsconfig.json",
|
"./tsconfig.json",
|
||||||
|
"./shared/tsconfig.json",
|
||||||
|
"./scripts/tsconfig.json",
|
||||||
|
"./server/tsconfig.json",
|
||||||
"./server/tools/tsconfig.json"
|
"./server/tools/tsconfig.json"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
3
.gitignore
vendored
3
.gitignore
vendored
@ -50,3 +50,6 @@ yarn-error.log
|
|||||||
/server/tools/import-mediacore.ts
|
/server/tools/import-mediacore.ts
|
||||||
/docker-volume/
|
/docker-volume/
|
||||||
/init.mp4
|
/init.mp4
|
||||||
|
|
||||||
|
# TypeScript
|
||||||
|
*.tsbuildinfo
|
||||||
|
@ -4,7 +4,10 @@ set -eu
|
|||||||
|
|
||||||
rm -rf ./dist
|
rm -rf ./dist
|
||||||
|
|
||||||
npm run tsc
|
npm run tsc -- -b --verbose
|
||||||
cp "./tsconfig.json" "./dist"
|
cp "./tsconfig.base.json" "./tsconfig.json" "./dist/"
|
||||||
|
cp "./scripts/tsconfig.json" "./dist/scripts/"
|
||||||
|
cp "./server/tsconfig.json" "./dist/server/"
|
||||||
|
cp "./shared/tsconfig.json" "./dist/shared/"
|
||||||
cp -r "./server/static" "./server/assets" "./dist/server"
|
cp -r "./server/static" "./server/assets" "./dist/server"
|
||||||
cp -r "./server/lib/emails" "./dist/server/lib"
|
cp -r "./server/lib/emails" "./dist/server/lib"
|
||||||
|
@ -3,7 +3,7 @@ registerTSPaths()
|
|||||||
|
|
||||||
import { readdir, stat } from 'fs-extra'
|
import { readdir, stat } from 'fs-extra'
|
||||||
import { join } from 'path'
|
import { join } from 'path'
|
||||||
import { root } from '@server/helpers/core-utils'
|
import { root } from '@shared/core-utils'
|
||||||
|
|
||||||
async function run () {
|
async function run () {
|
||||||
const result = {
|
const result = {
|
||||||
|
@ -11,6 +11,6 @@ rm -rf ./dist/server/tools/
|
|||||||
yarn install --pure-lockfile
|
yarn install --pure-lockfile
|
||||||
)
|
)
|
||||||
|
|
||||||
npm run tsc -- --build ./server/tools/tsconfig.json
|
npm run tsc -- --build --verbose ./server/tools/tsconfig.json
|
||||||
cp -r "./server/tools/node_modules" "./dist/server/tools"
|
cp -r "./server/tools/node_modules" "./dist/server/tools"
|
||||||
cp "./tsconfig.json" "./dist"
|
cp "./tsconfig.json" "./dist"
|
||||||
|
10
scripts/tsconfig.json
Normal file
10
scripts/tsconfig.json
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"extends": "../tsconfig.base.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"outDir": "../dist/scripts",
|
||||||
|
},
|
||||||
|
"references": [
|
||||||
|
{ "path": "../shared" },
|
||||||
|
{ "path": "../server" }
|
||||||
|
]
|
||||||
|
}
|
@ -1,7 +1,7 @@
|
|||||||
import express from 'express'
|
import express from 'express'
|
||||||
import RateLimit from 'express-rate-limit'
|
import RateLimit from 'express-rate-limit'
|
||||||
import { logger } from '@server/helpers/logger'
|
import { logger } from '@server/helpers/logger'
|
||||||
import { buildUUID } from '@server/helpers/uuid'
|
import { buildUUID } from '@shared/core-utils/uuid'
|
||||||
import { CONFIG } from '@server/initializers/config'
|
import { CONFIG } from '@server/initializers/config'
|
||||||
import { getAuthNameFromRefreshGrant, getBypassFromExternalAuth, getBypassFromPasswordGrant } from '@server/lib/auth/external-auth'
|
import { getAuthNameFromRefreshGrant, getBypassFromExternalAuth, getBypassFromPasswordGrant } from '@server/lib/auth/external-auth'
|
||||||
import { handleOAuthToken } from '@server/lib/auth/oauth'
|
import { handleOAuthToken } from '@server/lib/auth/oauth'
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import express from 'express'
|
import express from 'express'
|
||||||
import { join } from 'path'
|
import { join } from 'path'
|
||||||
import { uuidToShort } from '@server/helpers/uuid'
|
import { uuidToShort } from '@shared/core-utils/uuid'
|
||||||
import { scheduleRefreshIfNeeded } from '@server/lib/activitypub/playlists'
|
import { scheduleRefreshIfNeeded } from '@server/lib/activitypub/playlists'
|
||||||
import { Hooks } from '@server/lib/plugins/hooks'
|
import { Hooks } from '@server/lib/plugins/hooks'
|
||||||
import { getServerActor } from '@server/models/application/application'
|
import { getServerActor } from '@server/models/application/application'
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import express from 'express'
|
import express from 'express'
|
||||||
import { createReqFiles } from '@server/helpers/express-utils'
|
import { createReqFiles } from '@server/helpers/express-utils'
|
||||||
import { buildUUID, uuidToShort } from '@server/helpers/uuid'
|
import { buildUUID, uuidToShort } from '@shared/core-utils/uuid'
|
||||||
import { CONFIG } from '@server/initializers/config'
|
import { CONFIG } from '@server/initializers/config'
|
||||||
import { ASSETS_PATH, MIMETYPES } from '@server/initializers/constants'
|
import { ASSETS_PATH, MIMETYPES } from '@server/initializers/constants'
|
||||||
import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url'
|
import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url'
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
import express from 'express'
|
import express from 'express'
|
||||||
import { move } from 'fs-extra'
|
import { move } from 'fs-extra'
|
||||||
import { basename } from 'path'
|
import { basename } from 'path'
|
||||||
import { getLowercaseExtension } from '@server/helpers/core-utils'
|
import { getLowercaseExtension } from '@shared/core-utils'
|
||||||
import { getResumableUploadPath } from '@server/helpers/upload'
|
import { getResumableUploadPath } from '@server/helpers/upload'
|
||||||
import { uuidToShort } from '@server/helpers/uuid'
|
import { uuidToShort } from '@shared/core-utils/uuid'
|
||||||
import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
|
import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
|
||||||
import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url'
|
import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url'
|
||||||
import { generateWebTorrentVideoFilename } from '@server/lib/paths'
|
import { generateWebTorrentVideoFilename } from '@server/lib/paths'
|
||||||
|
@ -7,7 +7,7 @@ import { CONFIG } from '@server/initializers/config'
|
|||||||
import { Hooks } from '@server/lib/plugins/hooks'
|
import { Hooks } from '@server/lib/plugins/hooks'
|
||||||
import { buildFileLocale, getCompleteLocale, is18nLocale, LOCALE_FILES } from '@shared/core-utils/i18n'
|
import { buildFileLocale, getCompleteLocale, is18nLocale, LOCALE_FILES } from '@shared/core-utils/i18n'
|
||||||
import { HttpStatusCode } from '@shared/models'
|
import { HttpStatusCode } from '@shared/models'
|
||||||
import { root } from '../helpers/core-utils'
|
import { root } from '@shared/core-utils'
|
||||||
import { STATIC_MAX_AGE } from '../initializers/constants'
|
import { STATIC_MAX_AGE } from '../initializers/constants'
|
||||||
import { ClientHtml, sendHTML, serveIndexHTML } from '../lib/client-html'
|
import { ClientHtml, sendHTML, serveIndexHTML } from '../lib/client-html'
|
||||||
import { asyncMiddleware, embedCSP } from '../middlewares'
|
import { asyncMiddleware, embedCSP } from '../middlewares'
|
||||||
|
@ -5,7 +5,7 @@ import { serveIndexHTML } from '@server/lib/client-html'
|
|||||||
import { ServerConfigManager } from '@server/lib/server-config-manager'
|
import { ServerConfigManager } from '@server/lib/server-config-manager'
|
||||||
import { HttpStatusCode } from '@shared/models'
|
import { HttpStatusCode } from '@shared/models'
|
||||||
import { HttpNodeinfoDiasporaSoftwareNsSchema20 } from '../../shared/models/nodeinfo/nodeinfo.model'
|
import { HttpNodeinfoDiasporaSoftwareNsSchema20 } from '../../shared/models/nodeinfo/nodeinfo.model'
|
||||||
import { root } from '../helpers/core-utils'
|
import { root } from '@shared/core-utils'
|
||||||
import { CONFIG, isEmailEnabled } from '../initializers/config'
|
import { CONFIG, isEmailEnabled } from '../initializers/config'
|
||||||
import {
|
import {
|
||||||
CONSTRAINTS_FIELDS,
|
CONSTRAINTS_FIELDS,
|
||||||
|
@ -6,9 +6,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import { exec, ExecOptions } from 'child_process'
|
import { exec, ExecOptions } from 'child_process'
|
||||||
import { BinaryToTextEncoding, createHash, randomBytes } from 'crypto'
|
import { randomBytes } from 'crypto'
|
||||||
import { truncate } from 'lodash'
|
import { truncate } from 'lodash'
|
||||||
import { basename, extname, isAbsolute, join, resolve } from 'path'
|
|
||||||
import { createPrivateKey as createPrivateKey_1, getPublicKey as getPublicKey_1 } from 'pem'
|
import { createPrivateKey as createPrivateKey_1, getPublicKey as getPublicKey_1 } from 'pem'
|
||||||
import { pipeline } from 'stream'
|
import { pipeline } from 'stream'
|
||||||
import { URL } from 'url'
|
import { URL } from 'url'
|
||||||
@ -159,34 +158,6 @@ function getAppNumber () {
|
|||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
let rootPath: string
|
|
||||||
|
|
||||||
function root () {
|
|
||||||
if (rootPath) return rootPath
|
|
||||||
|
|
||||||
rootPath = __dirname
|
|
||||||
|
|
||||||
if (basename(rootPath) === 'helpers') rootPath = resolve(rootPath, '..')
|
|
||||||
if (basename(rootPath) === 'server') rootPath = resolve(rootPath, '..')
|
|
||||||
if (basename(rootPath) === 'dist') rootPath = resolve(rootPath, '..')
|
|
||||||
|
|
||||||
return rootPath
|
|
||||||
}
|
|
||||||
|
|
||||||
function buildPath (path: string) {
|
|
||||||
if (isAbsolute(path)) return path
|
|
||||||
|
|
||||||
return join(root(), path)
|
|
||||||
}
|
|
||||||
|
|
||||||
function getLowercaseExtension (filename: string) {
|
|
||||||
const ext = extname(filename) || ''
|
|
||||||
|
|
||||||
return ext.toLowerCase()
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
// Consistent with .length, lodash truncate function is not
|
// Consistent with .length, lodash truncate function is not
|
||||||
function peertubeTruncate (str: string, options: { length: number, separator?: RegExp, omission?: string }) {
|
function peertubeTruncate (str: string, options: { length: number, separator?: RegExp, omission?: string }) {
|
||||||
const truncatedStr = truncate(str, options)
|
const truncatedStr = truncate(str, options)
|
||||||
@ -221,16 +192,6 @@ function parseSemVersion (s: string) {
|
|||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
function sha256 (str: string | Buffer, encoding: BinaryToTextEncoding = 'hex') {
|
|
||||||
return createHash('sha256').update(str).digest(encoding)
|
|
||||||
}
|
|
||||||
|
|
||||||
function sha1 (str: string | Buffer, encoding: BinaryToTextEncoding = 'hex') {
|
|
||||||
return createHash('sha1').update(str).digest(encoding)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
function execShell (command: string, options?: ExecOptions) {
|
function execShell (command: string, options?: ExecOptions) {
|
||||||
return new Promise<{ err?: Error, stdout: string, stderr: string }>((res, rej) => {
|
return new Promise<{ err?: Error, stdout: string, stderr: string }>((res, rej) => {
|
||||||
exec(command, options, (err, stdout, stderr) => {
|
exec(command, options, (err, stdout, stderr) => {
|
||||||
@ -298,9 +259,6 @@ export {
|
|||||||
objectConverter,
|
objectConverter,
|
||||||
mapToJSON,
|
mapToJSON,
|
||||||
|
|
||||||
root,
|
|
||||||
buildPath,
|
|
||||||
getLowercaseExtension,
|
|
||||||
sanitizeUrl,
|
sanitizeUrl,
|
||||||
sanitizeHost,
|
sanitizeHost,
|
||||||
|
|
||||||
@ -309,9 +267,6 @@ export {
|
|||||||
pageToStartAndCount,
|
pageToStartAndCount,
|
||||||
peertubeTruncate,
|
peertubeTruncate,
|
||||||
|
|
||||||
sha256,
|
|
||||||
sha1,
|
|
||||||
|
|
||||||
promisify0,
|
promisify0,
|
||||||
promisify1,
|
promisify1,
|
||||||
promisify2,
|
promisify2,
|
||||||
|
@ -2,7 +2,7 @@ import 'multer'
|
|||||||
import { UploadFilesForCheck } from 'express'
|
import { UploadFilesForCheck } from 'express'
|
||||||
import { sep } from 'path'
|
import { sep } from 'path'
|
||||||
import validator from 'validator'
|
import validator from 'validator'
|
||||||
import { isShortUUID, shortToUUID } from '../uuid'
|
import { isShortUUID, shortToUUID } from '@shared/core-utils/uuid'
|
||||||
|
|
||||||
function exists (value: any) {
|
function exists (value: any) {
|
||||||
return value !== undefined && value !== null
|
return value !== undefined && value !== null
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
import express from 'express'
|
import express, { RequestHandler } from 'express'
|
||||||
import multer, { diskStorage } from 'multer'
|
import multer, { diskStorage } from 'multer'
|
||||||
import { HttpStatusCode } from '../../shared/models/http/http-error-codes'
|
import { HttpStatusCode } from '../../shared/models/http/http-error-codes'
|
||||||
import { CONFIG } from '../initializers/config'
|
import { CONFIG } from '../initializers/config'
|
||||||
import { REMOTE_SCHEME } from '../initializers/constants'
|
import { REMOTE_SCHEME } from '../initializers/constants'
|
||||||
import { getLowercaseExtension } from './core-utils'
|
import { getLowercaseExtension } from '@shared/core-utils'
|
||||||
import { isArray } from './custom-validators/misc'
|
import { isArray } from './custom-validators/misc'
|
||||||
import { logger } from './logger'
|
import { logger } from './logger'
|
||||||
import { deleteFileAndCatch, generateRandomString } from './utils'
|
import { deleteFileAndCatch, generateRandomString } from './utils'
|
||||||
@ -69,7 +69,7 @@ function createReqFiles (
|
|||||||
fieldNames: string[],
|
fieldNames: string[],
|
||||||
mimeTypes: { [id: string]: string | string[] },
|
mimeTypes: { [id: string]: string | string[] },
|
||||||
destinations: { [fieldName: string]: string }
|
destinations: { [fieldName: string]: string }
|
||||||
) {
|
): RequestHandler {
|
||||||
const storage = diskStorage({
|
const storage = diskStorage({
|
||||||
destination: (req, file, cb) => {
|
destination: (req, file, cb) => {
|
||||||
cb(null, destinations[file.fieldname])
|
cb(null, destinations[file.fieldname])
|
||||||
|
@ -1,9 +1,22 @@
|
|||||||
import { ffprobe, FfprobeData } from 'fluent-ffmpeg'
|
import { FfprobeData } from 'fluent-ffmpeg'
|
||||||
import { getMaxBitrate } from '@shared/core-utils'
|
import { getMaxBitrate } from '@shared/core-utils'
|
||||||
import { VideoFileMetadata, VideoResolution, VideoTranscodingFPS } from '../../shared/models/videos'
|
import { VideoResolution, VideoTranscodingFPS } from '../../shared/models/videos'
|
||||||
import { CONFIG } from '../initializers/config'
|
import { CONFIG } from '../initializers/config'
|
||||||
import { VIDEO_TRANSCODING_FPS } from '../initializers/constants'
|
import { VIDEO_TRANSCODING_FPS } from '../initializers/constants'
|
||||||
import { logger } from './logger'
|
import { logger } from './logger'
|
||||||
|
import {
|
||||||
|
canDoQuickAudioTranscode,
|
||||||
|
ffprobePromise,
|
||||||
|
getDurationFromVideoFile,
|
||||||
|
getAudioStream,
|
||||||
|
getMaxAudioBitrate,
|
||||||
|
getMetadataFromFile,
|
||||||
|
getVideoFileBitrate,
|
||||||
|
getVideoFileFPS,
|
||||||
|
getVideoFileResolution,
|
||||||
|
getVideoStreamFromFile,
|
||||||
|
getVideoStreamSize
|
||||||
|
} from '@shared/extra-utils/ffprobe'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
@ -11,79 +24,6 @@ import { logger } from './logger'
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function ffprobePromise (path: string) {
|
|
||||||
return new Promise<FfprobeData>((res, rej) => {
|
|
||||||
ffprobe(path, (err, data) => {
|
|
||||||
if (err) return rej(err)
|
|
||||||
|
|
||||||
return res(data)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
async function getAudioStream (videoPath: string, existingProbe?: FfprobeData) {
|
|
||||||
// without position, ffprobe considers the last input only
|
|
||||||
// we make it consider the first input only
|
|
||||||
// if you pass a file path to pos, then ffprobe acts on that file directly
|
|
||||||
const data = existingProbe || await ffprobePromise(videoPath)
|
|
||||||
|
|
||||||
if (Array.isArray(data.streams)) {
|
|
||||||
const audioStream = data.streams.find(stream => stream['codec_type'] === 'audio')
|
|
||||||
|
|
||||||
if (audioStream) {
|
|
||||||
return {
|
|
||||||
absolutePath: data.format.filename,
|
|
||||||
audioStream,
|
|
||||||
bitrate: parseInt(audioStream['bit_rate'] + '', 10)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return { absolutePath: data.format.filename }
|
|
||||||
}
|
|
||||||
|
|
||||||
function getMaxAudioBitrate (type: 'aac' | 'mp3' | string, bitrate: number) {
|
|
||||||
const maxKBitrate = 384
|
|
||||||
const kToBits = (kbits: number) => kbits * 1000
|
|
||||||
|
|
||||||
// If we did not manage to get the bitrate, use an average value
|
|
||||||
if (!bitrate) return 256
|
|
||||||
|
|
||||||
if (type === 'aac') {
|
|
||||||
switch (true) {
|
|
||||||
case bitrate > kToBits(maxKBitrate):
|
|
||||||
return maxKBitrate
|
|
||||||
|
|
||||||
default:
|
|
||||||
return -1 // we interpret it as a signal to copy the audio stream as is
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
a 192kbit/sec mp3 doesn't hold as much information as a 192kbit/sec aac.
|
|
||||||
That's why, when using aac, we can go to lower kbit/sec. The equivalences
|
|
||||||
made here are not made to be accurate, especially with good mp3 encoders.
|
|
||||||
*/
|
|
||||||
switch (true) {
|
|
||||||
case bitrate <= kToBits(192):
|
|
||||||
return 128
|
|
||||||
|
|
||||||
case bitrate <= kToBits(384):
|
|
||||||
return 256
|
|
||||||
|
|
||||||
default:
|
|
||||||
return maxKBitrate
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function getVideoStreamSize (path: string, existingProbe?: FfprobeData): Promise<{ width: number, height: number }> {
|
|
||||||
const videoStream = await getVideoStreamFromFile(path, existingProbe)
|
|
||||||
|
|
||||||
return videoStream === null
|
|
||||||
? { width: 0, height: 0 }
|
|
||||||
: { width: videoStream.width, height: videoStream.height }
|
|
||||||
}
|
|
||||||
|
|
||||||
async function getVideoStreamCodec (path: string) {
|
async function getVideoStreamCodec (path: string) {
|
||||||
const videoStream = await getVideoStreamFromFile(path)
|
const videoStream = await getVideoStreamFromFile(path)
|
||||||
|
|
||||||
@ -143,69 +83,6 @@ async function getAudioStreamCodec (path: string, existingProbe?: FfprobeData) {
|
|||||||
return 'mp4a.40.2' // Fallback
|
return 'mp4a.40.2' // Fallback
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getVideoFileResolution (path: string, existingProbe?: FfprobeData) {
|
|
||||||
const size = await getVideoStreamSize(path, existingProbe)
|
|
||||||
|
|
||||||
return {
|
|
||||||
width: size.width,
|
|
||||||
height: size.height,
|
|
||||||
ratio: Math.max(size.height, size.width) / Math.min(size.height, size.width),
|
|
||||||
resolution: Math.min(size.height, size.width),
|
|
||||||
isPortraitMode: size.height > size.width
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function getVideoFileFPS (path: string, existingProbe?: FfprobeData) {
|
|
||||||
const videoStream = await getVideoStreamFromFile(path, existingProbe)
|
|
||||||
if (videoStream === null) return 0
|
|
||||||
|
|
||||||
for (const key of [ 'avg_frame_rate', 'r_frame_rate' ]) {
|
|
||||||
const valuesText: string = videoStream[key]
|
|
||||||
if (!valuesText) continue
|
|
||||||
|
|
||||||
const [ frames, seconds ] = valuesText.split('/')
|
|
||||||
if (!frames || !seconds) continue
|
|
||||||
|
|
||||||
const result = parseInt(frames, 10) / parseInt(seconds, 10)
|
|
||||||
if (result > 0) return Math.round(result)
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
async function getMetadataFromFile (path: string, existingProbe?: FfprobeData) {
|
|
||||||
const metadata = existingProbe || await ffprobePromise(path)
|
|
||||||
|
|
||||||
return new VideoFileMetadata(metadata)
|
|
||||||
}
|
|
||||||
|
|
||||||
async function getVideoFileBitrate (path: string, existingProbe?: FfprobeData): Promise<number> {
|
|
||||||
const metadata = await getMetadataFromFile(path, existingProbe)
|
|
||||||
|
|
||||||
let bitrate = metadata.format.bit_rate as number
|
|
||||||
if (bitrate && !isNaN(bitrate)) return bitrate
|
|
||||||
|
|
||||||
const videoStream = await getVideoStreamFromFile(path, existingProbe)
|
|
||||||
if (!videoStream) return undefined
|
|
||||||
|
|
||||||
bitrate = videoStream?.bit_rate
|
|
||||||
if (bitrate && !isNaN(bitrate)) return bitrate
|
|
||||||
|
|
||||||
return undefined
|
|
||||||
}
|
|
||||||
|
|
||||||
async function getDurationFromVideoFile (path: string, existingProbe?: FfprobeData) {
|
|
||||||
const metadata = await getMetadataFromFile(path, existingProbe)
|
|
||||||
|
|
||||||
return Math.round(metadata.format.duration)
|
|
||||||
}
|
|
||||||
|
|
||||||
async function getVideoStreamFromFile (path: string, existingProbe?: FfprobeData) {
|
|
||||||
const metadata = await getMetadataFromFile(path, existingProbe)
|
|
||||||
|
|
||||||
return metadata.streams.find(s => s.codec_type === 'video') || null
|
|
||||||
}
|
|
||||||
|
|
||||||
function computeLowerResolutionsToTranscode (videoFileResolution: number, type: 'vod' | 'live') {
|
function computeLowerResolutionsToTranscode (videoFileResolution: number, type: 'vod' | 'live') {
|
||||||
const configResolutions = type === 'vod'
|
const configResolutions = type === 'vod'
|
||||||
? CONFIG.TRANSCODING.RESOLUTIONS
|
? CONFIG.TRANSCODING.RESOLUTIONS
|
||||||
@ -263,26 +140,6 @@ async function canDoQuickVideoTranscode (path: string, probe?: FfprobeData): Pro
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
async function canDoQuickAudioTranscode (path: string, probe?: FfprobeData): Promise<boolean> {
|
|
||||||
const parsedAudio = await getAudioStream(path, probe)
|
|
||||||
|
|
||||||
if (!parsedAudio.audioStream) return true
|
|
||||||
|
|
||||||
if (parsedAudio.audioStream['codec_name'] !== 'aac') return false
|
|
||||||
|
|
||||||
const audioBitrate = parsedAudio.bitrate
|
|
||||||
if (!audioBitrate) return false
|
|
||||||
|
|
||||||
const maxAudioBitrate = getMaxAudioBitrate('aac', audioBitrate)
|
|
||||||
if (maxAudioBitrate !== -1 && audioBitrate > maxAudioBitrate) return false
|
|
||||||
|
|
||||||
const channelLayout = parsedAudio.audioStream['channel_layout']
|
|
||||||
// Causes playback issues with Chrome
|
|
||||||
if (!channelLayout || channelLayout === 'unknown') return false
|
|
||||||
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
function getClosestFramerateStandard <K extends keyof Pick<VideoTranscodingFPS, 'HD_STANDARD' | 'STANDARD'>> (fps: number, type: K) {
|
function getClosestFramerateStandard <K extends keyof Pick<VideoTranscodingFPS, 'HD_STANDARD' | 'STANDARD'>> (fps: number, type: K) {
|
||||||
return VIDEO_TRANSCODING_FPS[type].slice(0)
|
return VIDEO_TRANSCODING_FPS[type].slice(0)
|
||||||
.sort((a, b) => fps % a - fps % b)[0]
|
.sort((a, b) => fps % a - fps % b)[0]
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
import { copy, readFile, remove, rename } from 'fs-extra'
|
import { copy, readFile, remove, rename } from 'fs-extra'
|
||||||
import Jimp, { read } from 'jimp'
|
import Jimp, { read } from 'jimp'
|
||||||
import { getLowercaseExtension } from './core-utils'
|
import { getLowercaseExtension } from '@shared/core-utils'
|
||||||
import { convertWebPToJPG, processGIF } from './ffmpeg-utils'
|
import { convertWebPToJPG, processGIF } from './ffmpeg-utils'
|
||||||
import { logger } from './logger'
|
import { logger } from './logger'
|
||||||
import { buildUUID } from './uuid'
|
import { buildUUID } from '@shared/core-utils/uuid'
|
||||||
|
|
||||||
function generateImageFilename (extension = '.jpg') {
|
function generateImageFilename (extension = '.jpg') {
|
||||||
return buildUUID() + extension
|
return buildUUID() + extension
|
||||||
|
@ -4,7 +4,8 @@ import { Request } from 'express'
|
|||||||
import { cloneDeep } from 'lodash'
|
import { cloneDeep } from 'lodash'
|
||||||
import { BCRYPT_SALT_SIZE, HTTP_SIGNATURE, PRIVATE_RSA_KEY_SIZE } from '../initializers/constants'
|
import { BCRYPT_SALT_SIZE, HTTP_SIGNATURE, PRIVATE_RSA_KEY_SIZE } from '../initializers/constants'
|
||||||
import { MActor } from '../types/models'
|
import { MActor } from '../types/models'
|
||||||
import { createPrivateKey, getPublicKey, promisify1, promisify2, sha256 } from './core-utils'
|
import { sha256 } from '@shared/core-utils/crypto'
|
||||||
|
import { createPrivateKey, getPublicKey, promisify1, promisify2 } from './core-utils'
|
||||||
import { jsonld } from './custom-jsonld-signature'
|
import { jsonld } from './custom-jsonld-signature'
|
||||||
import { logger } from './logger'
|
import { logger } from './logger'
|
||||||
|
|
||||||
|
@ -3,7 +3,8 @@ import { Instance as ParseTorrent } from 'parse-torrent'
|
|||||||
import { join } from 'path'
|
import { join } from 'path'
|
||||||
import { ResultList } from '../../shared'
|
import { ResultList } from '../../shared'
|
||||||
import { CONFIG } from '../initializers/config'
|
import { CONFIG } from '../initializers/config'
|
||||||
import { execPromise, execPromise2, randomBytesPromise, sha256 } from './core-utils'
|
import { sha256 } from '@shared/core-utils/crypto'
|
||||||
|
import { execPromise, execPromise2, randomBytesPromise } from './core-utils'
|
||||||
import { logger } from './logger'
|
import { logger } from './logger'
|
||||||
|
|
||||||
function deleteFileAndCatch (path: string) {
|
function deleteFileAndCatch (path: string) {
|
||||||
|
@ -14,7 +14,8 @@ import { MVideo } from '@server/types/models/video/video'
|
|||||||
import { MVideoFile, MVideoFileRedundanciesOpt } from '@server/types/models/video/video-file'
|
import { MVideoFile, MVideoFileRedundanciesOpt } from '@server/types/models/video/video-file'
|
||||||
import { MStreamingPlaylistVideo } from '@server/types/models/video/video-streaming-playlist'
|
import { MStreamingPlaylistVideo } from '@server/types/models/video/video-streaming-playlist'
|
||||||
import { CONFIG } from '../initializers/config'
|
import { CONFIG } from '../initializers/config'
|
||||||
import { promisify2, sha1 } from './core-utils'
|
import { promisify2 } from './core-utils'
|
||||||
|
import { sha1 } from '@shared/core-utils/crypto'
|
||||||
import { logger } from './logger'
|
import { logger } from './logger'
|
||||||
import { generateVideoImportTmpPath } from './utils'
|
import { generateVideoImportTmpPath } from './utils'
|
||||||
import { extractVideo } from './video'
|
import { extractVideo } from './video'
|
||||||
|
@ -6,7 +6,8 @@ import { VideoRedundancyConfigFilter } from '@shared/models/redundancy/video-red
|
|||||||
import { BroadcastMessageLevel } from '@shared/models/server'
|
import { BroadcastMessageLevel } from '@shared/models/server'
|
||||||
import { VideoPrivacy, VideosRedundancyStrategy } from '../../shared/models'
|
import { VideoPrivacy, VideosRedundancyStrategy } from '../../shared/models'
|
||||||
import { NSFWPolicyType } from '../../shared/models/videos/nsfw-policy.type'
|
import { NSFWPolicyType } from '../../shared/models/videos/nsfw-policy.type'
|
||||||
import { buildPath, parseBytes, parseDurationToMs, root } from '../helpers/core-utils'
|
import { buildPath, root } from '../../shared/core-utils'
|
||||||
|
import { parseBytes, parseDurationToMs } from '../helpers/core-utils'
|
||||||
|
|
||||||
// Use a variable to reload the configuration if we need
|
// Use a variable to reload the configuration if we need
|
||||||
let config: IConfig = require('config')
|
let config: IConfig = require('config')
|
||||||
|
@ -18,8 +18,9 @@ import { FollowState } from '../../shared/models/actors'
|
|||||||
import { NSFWPolicyType } from '../../shared/models/videos/nsfw-policy.type'
|
import { NSFWPolicyType } from '../../shared/models/videos/nsfw-policy.type'
|
||||||
import { VideoPlaylistPrivacy } from '../../shared/models/videos/playlist/video-playlist-privacy.model'
|
import { VideoPlaylistPrivacy } from '../../shared/models/videos/playlist/video-playlist-privacy.model'
|
||||||
import { VideoPlaylistType } from '../../shared/models/videos/playlist/video-playlist-type.model'
|
import { VideoPlaylistType } from '../../shared/models/videos/playlist/video-playlist-type.model'
|
||||||
|
import { root } from '../../shared/core-utils'
|
||||||
// Do not use barrels, remain constants as independent as possible
|
// Do not use barrels, remain constants as independent as possible
|
||||||
import { isTestInstance, root, sanitizeHost, sanitizeUrl } from '../helpers/core-utils'
|
import { isTestInstance, sanitizeHost, sanitizeUrl } from '../helpers/core-utils'
|
||||||
import { CONFIG, registerConfigChangedHandler } from './config'
|
import { CONFIG, registerConfigChangedHandler } from './config'
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { buildUUID } from '@server/helpers/uuid'
|
import { buildUUID } from '@shared/core-utils/uuid'
|
||||||
import * as Sequelize from 'sequelize'
|
import * as Sequelize from 'sequelize'
|
||||||
|
|
||||||
async function up (utils: {
|
async function up (utils: {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import * as Sequelize from 'sequelize'
|
import * as Sequelize from 'sequelize'
|
||||||
import { buildUUID } from '@server/helpers/uuid'
|
import { buildUUID } from '@shared/core-utils/uuid'
|
||||||
import { VideoPlaylistPrivacy, VideoPlaylistType } from '../../../shared/models/videos'
|
import { VideoPlaylistPrivacy, VideoPlaylistType } from '../../../shared/models/videos'
|
||||||
import { WEBSERVER } from '../constants'
|
import { WEBSERVER } from '../constants'
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import * as Sequelize from 'sequelize'
|
import * as Sequelize from 'sequelize'
|
||||||
import { buildUUID } from '@server/helpers/uuid'
|
import { buildUUID } from '@shared/core-utils/uuid'
|
||||||
|
|
||||||
async function up (utils: {
|
async function up (utils: {
|
||||||
transaction: Sequelize.Transaction
|
transaction: Sequelize.Transaction
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { getLowercaseExtension } from '@server/helpers/core-utils'
|
import { getLowercaseExtension } from '@shared/core-utils'
|
||||||
import { isActivityPubUrlValid } from '@server/helpers/custom-validators/activitypub/misc'
|
import { isActivityPubUrlValid } from '@server/helpers/custom-validators/activitypub/misc'
|
||||||
import { buildUUID } from '@server/helpers/uuid'
|
import { buildUUID } from '@shared/core-utils/uuid'
|
||||||
import { MIMETYPES } from '@server/initializers/constants'
|
import { MIMETYPES } from '@server/initializers/constants'
|
||||||
import { ActorModel } from '@server/models/actor/actor'
|
import { ActorModel } from '@server/models/actor/actor'
|
||||||
import { FilteredModelAttributes } from '@server/types'
|
import { FilteredModelAttributes } from '@server/types'
|
||||||
|
@ -8,7 +8,8 @@ import {
|
|||||||
UnauthorizedClientError,
|
UnauthorizedClientError,
|
||||||
UnsupportedGrantTypeError
|
UnsupportedGrantTypeError
|
||||||
} from 'oauth2-server'
|
} from 'oauth2-server'
|
||||||
import { randomBytesPromise, sha1 } from '@server/helpers/core-utils'
|
import { sha1 } from '@shared/core-utils/crypto'
|
||||||
|
import { randomBytesPromise } from '@server/helpers/core-utils'
|
||||||
import { MOAuthClient } from '@server/types/models'
|
import { MOAuthClient } from '@server/types/models'
|
||||||
import { OAUTH_LIFETIME } from '../../initializers/constants'
|
import { OAUTH_LIFETIME } from '../../initializers/constants'
|
||||||
import { BypassLogin, getClient, getRefreshToken, getUser, revokeToken, saveToken } from './oauth-model'
|
import { BypassLogin, getClient, getRefreshToken, getUser, revokeToken, saveToken } from './oauth-model'
|
||||||
|
@ -8,7 +8,8 @@ import { HTMLServerConfig } from '@shared/models'
|
|||||||
import { buildFileLocale, getDefaultLocale, is18nLocale, POSSIBLE_LOCALES } from '../../shared/core-utils/i18n/i18n'
|
import { buildFileLocale, getDefaultLocale, is18nLocale, POSSIBLE_LOCALES } from '../../shared/core-utils/i18n/i18n'
|
||||||
import { HttpStatusCode } from '../../shared/models/http/http-error-codes'
|
import { HttpStatusCode } from '../../shared/models/http/http-error-codes'
|
||||||
import { VideoPlaylistPrivacy, VideoPrivacy } from '../../shared/models/videos'
|
import { VideoPlaylistPrivacy, VideoPrivacy } from '../../shared/models/videos'
|
||||||
import { isTestInstance, sha256 } from '../helpers/core-utils'
|
import { isTestInstance } from '../helpers/core-utils'
|
||||||
|
import { sha256 } from '@shared/core-utils/crypto'
|
||||||
import { logger } from '../helpers/logger'
|
import { logger } from '../helpers/logger'
|
||||||
import { mdToPlainText } from '../helpers/markdown'
|
import { mdToPlainText } from '../helpers/markdown'
|
||||||
import { CONFIG } from '../initializers/config'
|
import { CONFIG } from '../initializers/config'
|
||||||
|
@ -4,7 +4,8 @@ import { createTransport, Transporter } from 'nodemailer'
|
|||||||
import { join } from 'path'
|
import { join } from 'path'
|
||||||
import { EmailPayload } from '@shared/models'
|
import { EmailPayload } from '@shared/models'
|
||||||
import { SendEmailDefaultOptions } from '../../shared/models/server/emailer.model'
|
import { SendEmailDefaultOptions } from '../../shared/models/server/emailer.model'
|
||||||
import { isTestInstance, root } from '../helpers/core-utils'
|
import { isTestInstance } from '../helpers/core-utils'
|
||||||
|
import { root } from '@shared/core-utils'
|
||||||
import { bunyanLogger, logger } from '../helpers/logger'
|
import { bunyanLogger, logger } from '../helpers/logger'
|
||||||
import { CONFIG, isEmailEnabled } from '../initializers/config'
|
import { CONFIG, isEmailEnabled } from '../initializers/config'
|
||||||
import { WEBSERVER } from '../initializers/constants'
|
import { WEBSERVER } from '../initializers/constants'
|
||||||
|
@ -2,7 +2,7 @@ import { close, ensureDir, move, open, outputJSON, read, readFile, remove, stat,
|
|||||||
import { flatten, uniq } from 'lodash'
|
import { flatten, uniq } from 'lodash'
|
||||||
import { basename, dirname, join } from 'path'
|
import { basename, dirname, join } from 'path'
|
||||||
import { MStreamingPlaylistFilesVideo, MVideo, MVideoUUID } from '@server/types/models'
|
import { MStreamingPlaylistFilesVideo, MVideo, MVideoUUID } from '@server/types/models'
|
||||||
import { sha256 } from '../helpers/core-utils'
|
import { sha256 } from '@shared/core-utils/crypto'
|
||||||
import { getAudioStreamCodec, getVideoStreamCodec, getVideoStreamSize } from '../helpers/ffprobe-utils'
|
import { getAudioStreamCodec, getVideoStreamCodec, getVideoStreamSize } from '../helpers/ffprobe-utils'
|
||||||
import { logger } from '../helpers/logger'
|
import { logger } from '../helpers/logger'
|
||||||
import { doRequest, doRequestAndSaveToFile } from '../helpers/requests'
|
import { doRequest, doRequestAndSaveToFile } from '../helpers/requests'
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { Job } from 'bull'
|
import { Job } from 'bull'
|
||||||
import { copy, stat } from 'fs-extra'
|
import { copy, stat } from 'fs-extra'
|
||||||
import { getLowercaseExtension } from '@server/helpers/core-utils'
|
import { getLowercaseExtension } from '@shared/core-utils'
|
||||||
import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
|
import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
|
||||||
import { CONFIG } from '@server/initializers/config'
|
import { CONFIG } from '@server/initializers/config'
|
||||||
import { federateVideoIfNeeded } from '@server/lib/activitypub/videos'
|
import { federateVideoIfNeeded } from '@server/lib/activitypub/videos'
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { Job } from 'bull'
|
import { Job } from 'bull'
|
||||||
import { move, remove, stat } from 'fs-extra'
|
import { move, remove, stat } from 'fs-extra'
|
||||||
import { getLowercaseExtension } from '@server/helpers/core-utils'
|
import { getLowercaseExtension } from '@shared/core-utils'
|
||||||
import { retryTransactionWrapper } from '@server/helpers/database-utils'
|
import { retryTransactionWrapper } from '@server/helpers/database-utils'
|
||||||
import { YoutubeDLWrapper } from '@server/helpers/youtube-dl'
|
import { YoutubeDLWrapper } from '@server/helpers/youtube-dl'
|
||||||
import { isPostImportVideoAccepted } from '@server/lib/moderation'
|
import { isPostImportVideoAccepted } from '@server/lib/moderation'
|
||||||
|
@ -2,8 +2,8 @@ import 'multer'
|
|||||||
import { queue } from 'async'
|
import { queue } from 'async'
|
||||||
import LRUCache from 'lru-cache'
|
import LRUCache from 'lru-cache'
|
||||||
import { join } from 'path'
|
import { join } from 'path'
|
||||||
import { getLowercaseExtension } from '@server/helpers/core-utils'
|
import { getLowercaseExtension } from '@shared/core-utils'
|
||||||
import { buildUUID } from '@server/helpers/uuid'
|
import { buildUUID } from '@shared/core-utils/uuid'
|
||||||
import { ActorModel } from '@server/models/actor/actor'
|
import { ActorModel } from '@server/models/actor/actor'
|
||||||
import { ActivityPubActorType, ActorImageType } from '@shared/models'
|
import { ActivityPubActorType, ActorImageType } from '@shared/models'
|
||||||
import { retryTransactionWrapper } from '../helpers/database-utils'
|
import { retryTransactionWrapper } from '../helpers/database-utils'
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { join } from 'path'
|
import { join } from 'path'
|
||||||
import { buildUUID } from '@server/helpers/uuid'
|
import { buildUUID } from '@shared/core-utils/uuid'
|
||||||
import { CONFIG } from '@server/initializers/config'
|
import { CONFIG } from '@server/initializers/config'
|
||||||
import { HLS_REDUNDANCY_DIRECTORY, HLS_STREAMING_PLAYLIST_DIRECTORY } from '@server/initializers/constants'
|
import { HLS_REDUNDANCY_DIRECTORY, HLS_STREAMING_PLAYLIST_DIRECTORY } from '@server/initializers/constants'
|
||||||
import { isStreamingPlaylist, MStreamingPlaylistVideo, MVideo, MVideoFile, MVideoUUID } from '@server/types/models'
|
import { isStreamingPlaylist, MStreamingPlaylistVideo, MVideo, MVideoFile, MVideoUUID } from '@server/types/models'
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { Transaction } from 'sequelize/types'
|
import { Transaction } from 'sequelize/types'
|
||||||
import { buildUUID } from '@server/helpers/uuid'
|
import { buildUUID } from '@shared/core-utils/uuid'
|
||||||
import { UserModel } from '@server/models/user/user'
|
import { UserModel } from '@server/models/user/user'
|
||||||
import { MActorDefault } from '@server/types/models/actor'
|
import { MActorDefault } from '@server/types/models/actor'
|
||||||
import { ActivityPubActorType } from '../../shared/models/activitypub'
|
import { ActivityPubActorType } from '../../shared/models/activitypub'
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { remove } from 'fs-extra'
|
import { remove } from 'fs-extra'
|
||||||
import { extname, join } from 'path'
|
import { extname, join } from 'path'
|
||||||
import { buildUUID } from '@server/helpers/uuid'
|
import { buildUUID } from '@shared/core-utils/uuid'
|
||||||
import { extractVideo } from '@server/helpers/video'
|
import { extractVideo } from '@server/helpers/video'
|
||||||
import { CONFIG } from '@server/initializers/config'
|
import { CONFIG } from '@server/initializers/config'
|
||||||
import {
|
import {
|
||||||
|
@ -16,9 +16,8 @@ import {
|
|||||||
Table,
|
Table,
|
||||||
UpdatedAt
|
UpdatedAt
|
||||||
} from 'sequelize-typescript'
|
} from 'sequelize-typescript'
|
||||||
import { getLowercaseExtension } from '@server/helpers/core-utils'
|
|
||||||
import { ModelCache } from '@server/models/model-cache'
|
import { ModelCache } from '@server/models/model-cache'
|
||||||
import { AttributesOnly } from '@shared/core-utils'
|
import { getLowercaseExtension, AttributesOnly } from '@shared/core-utils'
|
||||||
import { ActivityIconObject, ActivityPubActorType } from '../../../shared/models/activitypub'
|
import { ActivityIconObject, ActivityPubActorType } from '../../../shared/models/activitypub'
|
||||||
import { ActorImage } from '../../../shared/models/actors/actor-image.model'
|
import { ActorImage } from '../../../shared/models/actors/actor-image.model'
|
||||||
import { activityPubContextify } from '../../helpers/activitypub'
|
import { activityPubContextify } from '../../helpers/activitypub'
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { FindOptions, ModelIndexesOptions, Op, WhereOptions } from 'sequelize'
|
import { FindOptions, ModelIndexesOptions, Op, WhereOptions } from 'sequelize'
|
||||||
import { AllowNull, BelongsTo, Column, CreatedAt, Default, ForeignKey, Is, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
|
import { AllowNull, BelongsTo, Column, CreatedAt, Default, ForeignKey, Is, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
|
||||||
import { uuidToShort } from '@server/helpers/uuid'
|
import { uuidToShort } from '@shared/core-utils/uuid'
|
||||||
import { UserNotificationIncludes, UserNotificationModelForApi } from '@server/types/models/user'
|
import { UserNotificationIncludes, UserNotificationModelForApi } from '@server/types/models/user'
|
||||||
import { AttributesOnly } from '@shared/core-utils'
|
import { AttributesOnly } from '@shared/core-utils'
|
||||||
import { UserNotification, UserNotificationType } from '../../../shared'
|
import { UserNotification, UserNotificationType } from '../../../shared'
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { uuidToShort } from '@server/helpers/uuid'
|
import { uuidToShort } from '@shared/core-utils/uuid'
|
||||||
import { generateMagnetUri } from '@server/helpers/webtorrent'
|
import { generateMagnetUri } from '@server/helpers/webtorrent'
|
||||||
import { getLocalVideoFileMetadataUrl } from '@server/lib/video-urls'
|
import { getLocalVideoFileMetadataUrl } from '@server/lib/video-urls'
|
||||||
import { VideoViews } from '@server/lib/video-views'
|
import { VideoViews } from '@server/lib/video-views'
|
||||||
|
@ -15,7 +15,7 @@ import {
|
|||||||
Table,
|
Table,
|
||||||
UpdatedAt
|
UpdatedAt
|
||||||
} from 'sequelize-typescript'
|
} from 'sequelize-typescript'
|
||||||
import { buildUUID } from '@server/helpers/uuid'
|
import { buildUUID } from '@shared/core-utils/uuid'
|
||||||
import { MVideo, MVideoCaption, MVideoCaptionFormattable, MVideoCaptionVideo } from '@server/types/models'
|
import { MVideo, MVideoCaption, MVideoCaptionFormattable, MVideoCaptionVideo } from '@server/types/models'
|
||||||
import { AttributesOnly } from '@shared/core-utils'
|
import { AttributesOnly } from '@shared/core-utils'
|
||||||
import { VideoCaption } from '../../../shared/models/videos/caption/video-caption.model'
|
import { VideoCaption } from '../../../shared/models/videos/caption/video-caption.model'
|
||||||
|
@ -17,7 +17,7 @@ import {
|
|||||||
Table,
|
Table,
|
||||||
UpdatedAt
|
UpdatedAt
|
||||||
} from 'sequelize-typescript'
|
} from 'sequelize-typescript'
|
||||||
import { buildUUID, uuidToShort } from '@server/helpers/uuid'
|
import { buildUUID, uuidToShort } from '@shared/core-utils/uuid'
|
||||||
import { MAccountId, MChannelId } from '@server/types/models'
|
import { MAccountId, MChannelId } from '@server/types/models'
|
||||||
import { AttributesOnly, buildPlaylistEmbedPath, buildPlaylistWatchPath, pick } from '@shared/core-utils'
|
import { AttributesOnly, buildPlaylistEmbedPath, buildPlaylistWatchPath, pick } from '@shared/core-utils'
|
||||||
import { ActivityIconObject } from '../../../shared/models/activitypub/objects'
|
import { ActivityIconObject } from '../../../shared/models/activitypub/objects'
|
||||||
|
@ -21,7 +21,7 @@ import { MStreamingPlaylist, MVideo } from '@server/types/models'
|
|||||||
import { AttributesOnly } from '@shared/core-utils'
|
import { AttributesOnly } from '@shared/core-utils'
|
||||||
import { VideoStorage } from '@shared/models'
|
import { VideoStorage } from '@shared/models'
|
||||||
import { VideoStreamingPlaylistType } from '../../../shared/models/videos/video-streaming-playlist.type'
|
import { VideoStreamingPlaylistType } from '../../../shared/models/videos/video-streaming-playlist.type'
|
||||||
import { sha1 } from '../../helpers/core-utils'
|
import { sha1 } from '@shared/core-utils/crypto'
|
||||||
import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
|
import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
|
||||||
import { isArrayOf } from '../../helpers/custom-validators/misc'
|
import { isArrayOf } from '../../helpers/custom-validators/misc'
|
||||||
import { isVideoFileInfoHashValid } from '../../helpers/custom-validators/videos'
|
import { isVideoFileInfoHashValid } from '../../helpers/custom-validators/videos'
|
||||||
|
@ -25,7 +25,7 @@ import {
|
|||||||
UpdatedAt
|
UpdatedAt
|
||||||
} from 'sequelize-typescript'
|
} from 'sequelize-typescript'
|
||||||
import { buildNSFWFilter } from '@server/helpers/express-utils'
|
import { buildNSFWFilter } from '@server/helpers/express-utils'
|
||||||
import { uuidToShort } from '@server/helpers/uuid'
|
import { uuidToShort } from '@shared/core-utils/uuid'
|
||||||
import { getPrivaciesForFederation, isPrivacyForFederation, isStateForFederation } from '@server/helpers/video'
|
import { getPrivaciesForFederation, isPrivacyForFederation, isStateForFederation } from '@server/helpers/video'
|
||||||
import { LiveManager } from '@server/lib/live/live-manager'
|
import { LiveManager } from '@server/lib/live/live-manager'
|
||||||
import { removeHLSObjectStorage, removeWebTorrentObjectStorage } from '@server/lib/object-storage'
|
import { removeHLSObjectStorage, removeWebTorrentObjectStorage } from '@server/lib/object-storage'
|
||||||
|
@ -7,7 +7,7 @@ import { buildDigest } from '@server/helpers/peertube-crypto'
|
|||||||
import { HTTP_SIGNATURE } from '@server/initializers/constants'
|
import { HTTP_SIGNATURE } from '@server/initializers/constants'
|
||||||
import { buildGlobalHeaders } from '@server/lib/job-queue/handlers/utils/activitypub-http-utils'
|
import { buildGlobalHeaders } from '@server/lib/job-queue/handlers/utils/activitypub-http-utils'
|
||||||
import { buildAbsoluteFixturePath, cleanupTests, createMultipleServers, killallServers, PeerTubeServer, wait } from '@shared/extra-utils'
|
import { buildAbsoluteFixturePath, cleanupTests, createMultipleServers, killallServers, PeerTubeServer, wait } from '@shared/extra-utils'
|
||||||
import { makeFollowRequest, makePOSTAPRequest } from '@shared/extra-utils/requests/activitypub'
|
import { makeFollowRequest, makePOSTAPRequest } from '@server/tests/shared'
|
||||||
import { HttpStatusCode } from '@shared/models'
|
import { HttpStatusCode } from '@shared/models'
|
||||||
|
|
||||||
const expect = chai.expect
|
const expect = chai.expect
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
|
/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
|
||||||
|
|
||||||
import 'mocha'
|
import 'mocha'
|
||||||
import { buildUUID } from '@server/helpers/uuid'
|
import { buildUUID } from '@shared/core-utils/uuid'
|
||||||
import {
|
import {
|
||||||
checkAbuseStateChange,
|
checkAbuseStateChange,
|
||||||
checkAutoInstanceFollowing,
|
checkAutoInstanceFollowing,
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
import 'mocha'
|
import 'mocha'
|
||||||
import * as chai from 'chai'
|
import * as chai from 'chai'
|
||||||
import { buildUUID } from '@server/helpers/uuid'
|
import { buildUUID } from '@shared/core-utils/uuid'
|
||||||
import {
|
import {
|
||||||
CheckerBaseParams,
|
CheckerBaseParams,
|
||||||
checkMyVideoImportIsFinished,
|
checkMyVideoImportIsFinished,
|
||||||
|
@ -4,7 +4,6 @@ import 'mocha'
|
|||||||
import * as chai from 'chai'
|
import * as chai from 'chai'
|
||||||
import {
|
import {
|
||||||
cleanupTests,
|
cleanupTests,
|
||||||
completeVideoCheck,
|
|
||||||
createMultipleServers,
|
createMultipleServers,
|
||||||
dateIsValid,
|
dateIsValid,
|
||||||
expectAccountFollows,
|
expectAccountFollows,
|
||||||
@ -15,6 +14,7 @@ import {
|
|||||||
waitJobs
|
waitJobs
|
||||||
} from '@shared/extra-utils'
|
} from '@shared/extra-utils'
|
||||||
import { VideoCreateResult, VideoPrivacy } from '@shared/models'
|
import { VideoCreateResult, VideoPrivacy } from '@shared/models'
|
||||||
|
import { completeVideoCheck } from '@server/tests/shared/video'
|
||||||
|
|
||||||
const expect = chai.expect
|
const expect = chai.expect
|
||||||
|
|
||||||
|
@ -5,7 +5,6 @@ import * as chai from 'chai'
|
|||||||
import {
|
import {
|
||||||
cleanupTests,
|
cleanupTests,
|
||||||
CommentsCommand,
|
CommentsCommand,
|
||||||
completeVideoCheck,
|
|
||||||
createMultipleServers,
|
createMultipleServers,
|
||||||
killallServers,
|
killallServers,
|
||||||
PeerTubeServer,
|
PeerTubeServer,
|
||||||
@ -14,6 +13,7 @@ import {
|
|||||||
waitJobs
|
waitJobs
|
||||||
} from '@shared/extra-utils'
|
} from '@shared/extra-utils'
|
||||||
import { HttpStatusCode, JobState, VideoCreateResult, VideoPrivacy } from '@shared/models'
|
import { HttpStatusCode, JobState, VideoCreateResult, VideoPrivacy } from '@shared/models'
|
||||||
|
import { completeVideoCheck } from '@server/tests/shared/video'
|
||||||
|
|
||||||
const expect = chai.expect
|
const expect = chai.expect
|
||||||
|
|
||||||
|
@ -8,7 +8,6 @@ import {
|
|||||||
checkTmpIsEmpty,
|
checkTmpIsEmpty,
|
||||||
checkVideoFilesWereRemoved,
|
checkVideoFilesWereRemoved,
|
||||||
cleanupTests,
|
cleanupTests,
|
||||||
completeVideoCheck,
|
|
||||||
createMultipleServers,
|
createMultipleServers,
|
||||||
dateIsValid,
|
dateIsValid,
|
||||||
doubleFollow,
|
doubleFollow,
|
||||||
@ -21,6 +20,7 @@ import {
|
|||||||
webtorrentAdd
|
webtorrentAdd
|
||||||
} from '@shared/extra-utils'
|
} from '@shared/extra-utils'
|
||||||
import { HttpStatusCode, VideoCommentThreadTree, VideoPrivacy } from '@shared/models'
|
import { HttpStatusCode, VideoCommentThreadTree, VideoPrivacy } from '@shared/models'
|
||||||
|
import { completeVideoCheck } from '@server/tests/shared/video'
|
||||||
|
|
||||||
const expect = chai.expect
|
const expect = chai.expect
|
||||||
|
|
||||||
|
@ -5,7 +5,6 @@ import * as chai from 'chai'
|
|||||||
import {
|
import {
|
||||||
checkVideoFilesWereRemoved,
|
checkVideoFilesWereRemoved,
|
||||||
cleanupTests,
|
cleanupTests,
|
||||||
completeVideoCheck,
|
|
||||||
createSingleServer,
|
createSingleServer,
|
||||||
PeerTubeServer,
|
PeerTubeServer,
|
||||||
setAccessTokensToServers,
|
setAccessTokensToServers,
|
||||||
@ -13,6 +12,7 @@ import {
|
|||||||
wait
|
wait
|
||||||
} from '@shared/extra-utils'
|
} from '@shared/extra-utils'
|
||||||
import { Video, VideoPrivacy } from '@shared/models'
|
import { Video, VideoPrivacy } from '@shared/models'
|
||||||
|
import { completeVideoCheck } from '@server/tests/shared/video'
|
||||||
|
|
||||||
const expect = chai.expect
|
const expect = chai.expect
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ import 'mocha'
|
|||||||
import * as chai from 'chai'
|
import * as chai from 'chai'
|
||||||
import { createFile, readdir } from 'fs-extra'
|
import { createFile, readdir } from 'fs-extra'
|
||||||
import { join } from 'path'
|
import { join } from 'path'
|
||||||
import { buildUUID } from '@server/helpers/uuid'
|
import { buildUUID } from '@shared/core-utils/uuid'
|
||||||
import {
|
import {
|
||||||
cleanupTests,
|
cleanupTests,
|
||||||
CLICommand,
|
CLICommand,
|
||||||
|
2
server/tests/shared/index.ts
Normal file
2
server/tests/shared/index.ts
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
export * from './requests'
|
||||||
|
export * from './video'
|
@ -1,9 +1,9 @@
|
|||||||
import { activityPubContextify } from '../../../server/helpers/activitypub'
|
import { doRequest } from '@server/helpers/requests'
|
||||||
import { doRequest } from '../../../server/helpers/requests'
|
import { activityPubContextify } from '@server/helpers/activitypub'
|
||||||
import { HTTP_SIGNATURE } from '../../../server/initializers/constants'
|
import { HTTP_SIGNATURE } from '@server/initializers/constants'
|
||||||
import { buildGlobalHeaders } from '../../../server/lib/job-queue/handlers/utils/activitypub-http-utils'
|
import { buildGlobalHeaders } from '@server/lib/job-queue/handlers/utils/activitypub-http-utils'
|
||||||
|
|
||||||
function makePOSTAPRequest (url: string, body: any, httpSignature: any, headers: any) {
|
export function makePOSTAPRequest (url: string, body: any, httpSignature: any, headers: any) {
|
||||||
const options = {
|
const options = {
|
||||||
method: 'POST' as 'POST',
|
method: 'POST' as 'POST',
|
||||||
json: body,
|
json: body,
|
||||||
@ -14,7 +14,7 @@ function makePOSTAPRequest (url: string, body: any, httpSignature: any, headers:
|
|||||||
return doRequest(url, options)
|
return doRequest(url, options)
|
||||||
}
|
}
|
||||||
|
|
||||||
async function makeFollowRequest (to: { url: string }, by: { url: string, privateKey }) {
|
export async function makeFollowRequest (to: { url: string }, by: { url: string, privateKey }) {
|
||||||
const follow = {
|
const follow = {
|
||||||
type: 'Follow',
|
type: 'Follow',
|
||||||
id: by.url + '/' + new Date().getTime(),
|
id: by.url + '/' + new Date().getTime(),
|
||||||
@ -35,8 +35,3 @@ async function makeFollowRequest (to: { url: string }, by: { url: string, privat
|
|||||||
|
|
||||||
return makePOSTAPRequest(to.url + '/inbox', body, httpSignature, headers)
|
return makePOSTAPRequest(to.url + '/inbox', body, httpSignature, headers)
|
||||||
}
|
}
|
||||||
|
|
||||||
export {
|
|
||||||
makePOSTAPRequest,
|
|
||||||
makeFollowRequest
|
|
||||||
}
|
|
148
server/tests/shared/video.ts
Normal file
148
server/tests/shared/video.ts
Normal file
@ -0,0 +1,148 @@
|
|||||||
|
/* eslint-disable @typescript-eslint/no-unused-expressions */
|
||||||
|
import { dateIsValid, makeRawRequest, PeerTubeServer, testImage, webtorrentAdd } from '@shared/extra-utils'
|
||||||
|
import { expect } from 'chai'
|
||||||
|
import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '@server/initializers/constants'
|
||||||
|
import { getLowercaseExtension, uuidRegex } from '@shared/core-utils'
|
||||||
|
|
||||||
|
export async function completeVideoCheck (
|
||||||
|
server: PeerTubeServer,
|
||||||
|
video: any,
|
||||||
|
attributes: {
|
||||||
|
name: string
|
||||||
|
category: number
|
||||||
|
licence: number
|
||||||
|
language: string
|
||||||
|
nsfw: boolean
|
||||||
|
commentsEnabled: boolean
|
||||||
|
downloadEnabled: boolean
|
||||||
|
description: string
|
||||||
|
publishedAt?: string
|
||||||
|
support: string
|
||||||
|
originallyPublishedAt?: string
|
||||||
|
account: {
|
||||||
|
name: string
|
||||||
|
host: string
|
||||||
|
}
|
||||||
|
isLocal: boolean
|
||||||
|
tags: string[]
|
||||||
|
privacy: number
|
||||||
|
likes?: number
|
||||||
|
dislikes?: number
|
||||||
|
duration: number
|
||||||
|
channel: {
|
||||||
|
displayName: string
|
||||||
|
name: string
|
||||||
|
description: string
|
||||||
|
isLocal: boolean
|
||||||
|
}
|
||||||
|
fixture: string
|
||||||
|
files: {
|
||||||
|
resolution: number
|
||||||
|
size: number
|
||||||
|
}[]
|
||||||
|
thumbnailfile?: string
|
||||||
|
previewfile?: string
|
||||||
|
}
|
||||||
|
) {
|
||||||
|
if (!attributes.likes) attributes.likes = 0
|
||||||
|
if (!attributes.dislikes) attributes.dislikes = 0
|
||||||
|
|
||||||
|
const host = new URL(server.url).host
|
||||||
|
const originHost = attributes.account.host
|
||||||
|
|
||||||
|
expect(video.name).to.equal(attributes.name)
|
||||||
|
expect(video.category.id).to.equal(attributes.category)
|
||||||
|
expect(video.category.label).to.equal(attributes.category !== null ? VIDEO_CATEGORIES[attributes.category] : 'Misc')
|
||||||
|
expect(video.licence.id).to.equal(attributes.licence)
|
||||||
|
expect(video.licence.label).to.equal(attributes.licence !== null ? VIDEO_LICENCES[attributes.licence] : 'Unknown')
|
||||||
|
expect(video.language.id).to.equal(attributes.language)
|
||||||
|
expect(video.language.label).to.equal(attributes.language !== null ? VIDEO_LANGUAGES[attributes.language] : 'Unknown')
|
||||||
|
expect(video.privacy.id).to.deep.equal(attributes.privacy)
|
||||||
|
expect(video.privacy.label).to.deep.equal(VIDEO_PRIVACIES[attributes.privacy])
|
||||||
|
expect(video.nsfw).to.equal(attributes.nsfw)
|
||||||
|
expect(video.description).to.equal(attributes.description)
|
||||||
|
expect(video.account.id).to.be.a('number')
|
||||||
|
expect(video.account.host).to.equal(attributes.account.host)
|
||||||
|
expect(video.account.name).to.equal(attributes.account.name)
|
||||||
|
expect(video.channel.displayName).to.equal(attributes.channel.displayName)
|
||||||
|
expect(video.channel.name).to.equal(attributes.channel.name)
|
||||||
|
expect(video.likes).to.equal(attributes.likes)
|
||||||
|
expect(video.dislikes).to.equal(attributes.dislikes)
|
||||||
|
expect(video.isLocal).to.equal(attributes.isLocal)
|
||||||
|
expect(video.duration).to.equal(attributes.duration)
|
||||||
|
expect(video.url).to.contain(originHost)
|
||||||
|
expect(dateIsValid(video.createdAt)).to.be.true
|
||||||
|
expect(dateIsValid(video.publishedAt)).to.be.true
|
||||||
|
expect(dateIsValid(video.updatedAt)).to.be.true
|
||||||
|
|
||||||
|
if (attributes.publishedAt) {
|
||||||
|
expect(video.publishedAt).to.equal(attributes.publishedAt)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (attributes.originallyPublishedAt) {
|
||||||
|
expect(video.originallyPublishedAt).to.equal(attributes.originallyPublishedAt)
|
||||||
|
} else {
|
||||||
|
expect(video.originallyPublishedAt).to.be.null
|
||||||
|
}
|
||||||
|
|
||||||
|
const videoDetails = await server.videos.get({ id: video.uuid })
|
||||||
|
|
||||||
|
expect(videoDetails.files).to.have.lengthOf(attributes.files.length)
|
||||||
|
expect(videoDetails.tags).to.deep.equal(attributes.tags)
|
||||||
|
expect(videoDetails.account.name).to.equal(attributes.account.name)
|
||||||
|
expect(videoDetails.account.host).to.equal(attributes.account.host)
|
||||||
|
expect(video.channel.displayName).to.equal(attributes.channel.displayName)
|
||||||
|
expect(video.channel.name).to.equal(attributes.channel.name)
|
||||||
|
expect(videoDetails.channel.host).to.equal(attributes.account.host)
|
||||||
|
expect(videoDetails.channel.isLocal).to.equal(attributes.channel.isLocal)
|
||||||
|
expect(dateIsValid(videoDetails.channel.createdAt.toString())).to.be.true
|
||||||
|
expect(dateIsValid(videoDetails.channel.updatedAt.toString())).to.be.true
|
||||||
|
expect(videoDetails.commentsEnabled).to.equal(attributes.commentsEnabled)
|
||||||
|
expect(videoDetails.downloadEnabled).to.equal(attributes.downloadEnabled)
|
||||||
|
|
||||||
|
for (const attributeFile of attributes.files) {
|
||||||
|
const file = videoDetails.files.find(f => f.resolution.id === attributeFile.resolution)
|
||||||
|
expect(file).not.to.be.undefined
|
||||||
|
|
||||||
|
let extension = getLowercaseExtension(attributes.fixture)
|
||||||
|
// Transcoding enabled: extension will always be .mp4
|
||||||
|
if (attributes.files.length > 1) extension = '.mp4'
|
||||||
|
|
||||||
|
expect(file.magnetUri).to.have.lengthOf.above(2)
|
||||||
|
|
||||||
|
expect(file.torrentDownloadUrl).to.match(new RegExp(`http://${host}/download/torrents/${uuidRegex}-${file.resolution.id}.torrent`))
|
||||||
|
expect(file.torrentUrl).to.match(new RegExp(`http://${host}/lazy-static/torrents/${uuidRegex}-${file.resolution.id}.torrent`))
|
||||||
|
|
||||||
|
expect(file.fileUrl).to.match(new RegExp(`http://${originHost}/static/webseed/${uuidRegex}-${file.resolution.id}${extension}`))
|
||||||
|
expect(file.fileDownloadUrl).to.match(new RegExp(`http://${originHost}/download/videos/${uuidRegex}-${file.resolution.id}${extension}`))
|
||||||
|
|
||||||
|
await Promise.all([
|
||||||
|
makeRawRequest(file.torrentUrl, 200),
|
||||||
|
makeRawRequest(file.torrentDownloadUrl, 200),
|
||||||
|
makeRawRequest(file.metadataUrl, 200)
|
||||||
|
])
|
||||||
|
|
||||||
|
expect(file.resolution.id).to.equal(attributeFile.resolution)
|
||||||
|
expect(file.resolution.label).to.equal(attributeFile.resolution + 'p')
|
||||||
|
|
||||||
|
const minSize = attributeFile.size - ((10 * attributeFile.size) / 100)
|
||||||
|
const maxSize = attributeFile.size + ((10 * attributeFile.size) / 100)
|
||||||
|
expect(
|
||||||
|
file.size,
|
||||||
|
'File size for resolution ' + file.resolution.label + ' outside confidence interval (' + minSize + '> size <' + maxSize + ')'
|
||||||
|
).to.be.above(minSize).and.below(maxSize)
|
||||||
|
|
||||||
|
const torrent = await webtorrentAdd(file.magnetUri, true)
|
||||||
|
expect(torrent.files).to.be.an('array')
|
||||||
|
expect(torrent.files.length).to.equal(1)
|
||||||
|
expect(torrent.files[0].path).to.exist.and.to.not.equal('')
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(videoDetails.thumbnailPath).to.exist
|
||||||
|
await testImage(server.url, attributes.thumbnailfile || attributes.fixture, videoDetails.thumbnailPath)
|
||||||
|
|
||||||
|
if (attributes.previewfile) {
|
||||||
|
expect(videoDetails.previewPath).to.exist
|
||||||
|
await testImage(server.url, attributes.previewfile, videoDetails.previewPath)
|
||||||
|
}
|
||||||
|
}
|
@ -5,7 +5,9 @@ import { createLogger, format, transports } from 'winston'
|
|||||||
import { PeerTubeServer } from '@shared/extra-utils'
|
import { PeerTubeServer } from '@shared/extra-utils'
|
||||||
import { UserRole } from '@shared/models'
|
import { UserRole } from '@shared/models'
|
||||||
import { VideoPrivacy } from '../../shared/models/videos'
|
import { VideoPrivacy } from '../../shared/models/videos'
|
||||||
import { getAppNumber, isTestInstance, root } from '../helpers/core-utils'
|
import { getAppNumber, isTestInstance } from '../helpers/core-utils'
|
||||||
|
import { root } from '@shared/core-utils'
|
||||||
|
import { loadLanguages } from '@server/initializers/constants'
|
||||||
|
|
||||||
let configName = 'PeerTube/CLI'
|
let configName = 'PeerTube/CLI'
|
||||||
if (isTestInstance()) configName += `-${getAppNumber()}`
|
if (isTestInstance()) configName += `-${getAppNumber()}`
|
||||||
@ -180,6 +182,7 @@ function getServerCredentials (program: Command) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function buildServer (url: string) {
|
function buildServer (url: string) {
|
||||||
|
loadLanguages()
|
||||||
return new PeerTubeServer({ url })
|
return new PeerTubeServer({ url })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ import { program } from 'commander'
|
|||||||
import { accessSync, constants } from 'fs'
|
import { accessSync, constants } from 'fs'
|
||||||
import { remove } from 'fs-extra'
|
import { remove } from 'fs-extra'
|
||||||
import { join } from 'path'
|
import { join } from 'path'
|
||||||
import { sha256 } from '../helpers/core-utils'
|
import { sha256 } from '@shared/core-utils/crypto'
|
||||||
import { doRequestAndSaveToFile } from '../helpers/requests'
|
import { doRequestAndSaveToFile } from '../helpers/requests'
|
||||||
import {
|
import {
|
||||||
assignToken,
|
assignToken,
|
||||||
|
@ -1,5 +1,11 @@
|
|||||||
{
|
{
|
||||||
"extends": "../../tsconfig.json",
|
"extends": "../../tsconfig.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"outDir": "../../dist/server/tools"
|
||||||
|
},
|
||||||
"include": [ ".", "../typings" ],
|
"include": [ ".", "../typings" ],
|
||||||
|
"references": [
|
||||||
|
{ "path": "../" },
|
||||||
|
],
|
||||||
"exclude": [ ] // Overwrite exclude property
|
"exclude": [ ] // Overwrite exclude property
|
||||||
}
|
}
|
||||||
|
12
server/tsconfig.json
Normal file
12
server/tsconfig.json
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
{
|
||||||
|
"extends": "../tsconfig.base.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"outDir": "../dist/server"
|
||||||
|
},
|
||||||
|
"references": [
|
||||||
|
{ "path": "../shared" }
|
||||||
|
],
|
||||||
|
"exclude": [
|
||||||
|
"tools/"
|
||||||
|
]
|
||||||
|
}
|
14
shared/core-utils/crypto.ts
Normal file
14
shared/core-utils/crypto.ts
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
import { BinaryToTextEncoding, createHash } from 'crypto'
|
||||||
|
|
||||||
|
function sha256 (str: string | Buffer, encoding: BinaryToTextEncoding = 'hex') {
|
||||||
|
return createHash('sha256').update(str).digest(encoding)
|
||||||
|
}
|
||||||
|
|
||||||
|
function sha1 (str: string | Buffer, encoding: BinaryToTextEncoding = 'hex') {
|
||||||
|
return createHash('sha1').update(str).digest(encoding)
|
||||||
|
}
|
||||||
|
|
||||||
|
export {
|
||||||
|
sha256,
|
||||||
|
sha1
|
||||||
|
}
|
@ -1,8 +1,10 @@
|
|||||||
export * from './abuse'
|
export * from './abuse'
|
||||||
export * from './common'
|
export * from './common'
|
||||||
export * from './i18n'
|
export * from './i18n'
|
||||||
|
export * from './path'
|
||||||
export * from './plugins'
|
export * from './plugins'
|
||||||
export * from './renderer'
|
export * from './renderer'
|
||||||
export * from './users'
|
export * from './users'
|
||||||
export * from './utils'
|
export * from './utils'
|
||||||
export * from './videos'
|
export * from './videos'
|
||||||
|
export * from './uuid'
|
||||||
|
34
shared/core-utils/path.ts
Normal file
34
shared/core-utils/path.ts
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
import { basename, extname, isAbsolute, join, resolve } from 'path'
|
||||||
|
|
||||||
|
let rootPath: string
|
||||||
|
|
||||||
|
function root () {
|
||||||
|
if (rootPath) return rootPath
|
||||||
|
|
||||||
|
rootPath = __dirname
|
||||||
|
|
||||||
|
if (basename(rootPath) === 'core-utils') rootPath = resolve(rootPath, '..')
|
||||||
|
if (basename(rootPath) === 'shared') rootPath = resolve(rootPath, '..')
|
||||||
|
if (basename(rootPath) === 'server') rootPath = resolve(rootPath, '..')
|
||||||
|
if (basename(rootPath) === 'dist') rootPath = resolve(rootPath, '..')
|
||||||
|
|
||||||
|
return rootPath
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildPath (path: string) {
|
||||||
|
if (isAbsolute(path)) return path
|
||||||
|
|
||||||
|
return join(root(), path)
|
||||||
|
}
|
||||||
|
|
||||||
|
function getLowercaseExtension (filename: string) {
|
||||||
|
const ext = extname(filename) || ''
|
||||||
|
|
||||||
|
return ext.toLowerCase()
|
||||||
|
}
|
||||||
|
|
||||||
|
export {
|
||||||
|
root,
|
||||||
|
buildPath,
|
||||||
|
getLowercaseExtension
|
||||||
|
}
|
180
shared/extra-utils/ffprobe.ts
Normal file
180
shared/extra-utils/ffprobe.ts
Normal file
@ -0,0 +1,180 @@
|
|||||||
|
import { ffprobe, FfprobeData } from 'fluent-ffmpeg'
|
||||||
|
import { VideoFileMetadata } from '@shared/models/videos'
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* Helpers to run ffprobe and extract data from the JSON output
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
function ffprobePromise (path: string) {
|
||||||
|
return new Promise<FfprobeData>((res, rej) => {
|
||||||
|
ffprobe(path, (err, data) => {
|
||||||
|
if (err) return rej(err)
|
||||||
|
|
||||||
|
return res(data)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getAudioStream (videoPath: string, existingProbe?: FfprobeData) {
|
||||||
|
// without position, ffprobe considers the last input only
|
||||||
|
// we make it consider the first input only
|
||||||
|
// if you pass a file path to pos, then ffprobe acts on that file directly
|
||||||
|
const data = existingProbe || await ffprobePromise(videoPath)
|
||||||
|
|
||||||
|
if (Array.isArray(data.streams)) {
|
||||||
|
const audioStream = data.streams.find(stream => stream['codec_type'] === 'audio')
|
||||||
|
|
||||||
|
if (audioStream) {
|
||||||
|
return {
|
||||||
|
absolutePath: data.format.filename,
|
||||||
|
audioStream,
|
||||||
|
bitrate: parseInt(audioStream['bit_rate'] + '', 10)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return { absolutePath: data.format.filename }
|
||||||
|
}
|
||||||
|
|
||||||
|
function getMaxAudioBitrate (type: 'aac' | 'mp3' | string, bitrate: number) {
|
||||||
|
const maxKBitrate = 384
|
||||||
|
const kToBits = (kbits: number) => kbits * 1000
|
||||||
|
|
||||||
|
// If we did not manage to get the bitrate, use an average value
|
||||||
|
if (!bitrate) return 256
|
||||||
|
|
||||||
|
if (type === 'aac') {
|
||||||
|
switch (true) {
|
||||||
|
case bitrate > kToBits(maxKBitrate):
|
||||||
|
return maxKBitrate
|
||||||
|
|
||||||
|
default:
|
||||||
|
return -1 // we interpret it as a signal to copy the audio stream as is
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
a 192kbit/sec mp3 doesn't hold as much information as a 192kbit/sec aac.
|
||||||
|
That's why, when using aac, we can go to lower kbit/sec. The equivalences
|
||||||
|
made here are not made to be accurate, especially with good mp3 encoders.
|
||||||
|
*/
|
||||||
|
switch (true) {
|
||||||
|
case bitrate <= kToBits(192):
|
||||||
|
return 128
|
||||||
|
|
||||||
|
case bitrate <= kToBits(384):
|
||||||
|
return 256
|
||||||
|
|
||||||
|
default:
|
||||||
|
return maxKBitrate
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getVideoStreamSize (path: string, existingProbe?: FfprobeData): Promise<{ width: number, height: number }> {
|
||||||
|
const videoStream = await getVideoStreamFromFile(path, existingProbe)
|
||||||
|
|
||||||
|
return videoStream === null
|
||||||
|
? { width: 0, height: 0 }
|
||||||
|
: { width: videoStream.width, height: videoStream.height }
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getVideoFileResolution (path: string, existingProbe?: FfprobeData) {
|
||||||
|
const size = await getVideoStreamSize(path, existingProbe)
|
||||||
|
|
||||||
|
return {
|
||||||
|
width: size.width,
|
||||||
|
height: size.height,
|
||||||
|
ratio: Math.max(size.height, size.width) / Math.min(size.height, size.width),
|
||||||
|
resolution: Math.min(size.height, size.width),
|
||||||
|
isPortraitMode: size.height > size.width
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getVideoFileFPS (path: string, existingProbe?: FfprobeData) {
|
||||||
|
const videoStream = await getVideoStreamFromFile(path, existingProbe)
|
||||||
|
if (videoStream === null) return 0
|
||||||
|
|
||||||
|
for (const key of [ 'avg_frame_rate', 'r_frame_rate' ]) {
|
||||||
|
const valuesText: string = videoStream[key]
|
||||||
|
if (!valuesText) continue
|
||||||
|
|
||||||
|
const [ frames, seconds ] = valuesText.split('/')
|
||||||
|
if (!frames || !seconds) continue
|
||||||
|
|
||||||
|
const result = parseInt(frames, 10) / parseInt(seconds, 10)
|
||||||
|
if (result > 0) return Math.round(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getMetadataFromFile (path: string, existingProbe?: FfprobeData) {
|
||||||
|
const metadata = existingProbe || await ffprobePromise(path)
|
||||||
|
|
||||||
|
return new VideoFileMetadata(metadata)
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getVideoFileBitrate (path: string, existingProbe?: FfprobeData): Promise<number> {
|
||||||
|
const metadata = await getMetadataFromFile(path, existingProbe)
|
||||||
|
|
||||||
|
let bitrate = metadata.format.bit_rate as number
|
||||||
|
if (bitrate && !isNaN(bitrate)) return bitrate
|
||||||
|
|
||||||
|
const videoStream = await getVideoStreamFromFile(path, existingProbe)
|
||||||
|
if (!videoStream) return undefined
|
||||||
|
|
||||||
|
bitrate = videoStream?.bit_rate
|
||||||
|
if (bitrate && !isNaN(bitrate)) return bitrate
|
||||||
|
|
||||||
|
return undefined
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getDurationFromVideoFile (path: string, existingProbe?: FfprobeData) {
|
||||||
|
const metadata = await getMetadataFromFile(path, existingProbe)
|
||||||
|
|
||||||
|
return Math.round(metadata.format.duration)
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getVideoStreamFromFile (path: string, existingProbe?: FfprobeData) {
|
||||||
|
const metadata = await getMetadataFromFile(path, existingProbe)
|
||||||
|
|
||||||
|
return metadata.streams.find(s => s.codec_type === 'video') || null
|
||||||
|
}
|
||||||
|
|
||||||
|
async function canDoQuickAudioTranscode (path: string, probe?: FfprobeData): Promise<boolean> {
|
||||||
|
const parsedAudio = await getAudioStream(path, probe)
|
||||||
|
|
||||||
|
if (!parsedAudio.audioStream) return true
|
||||||
|
|
||||||
|
if (parsedAudio.audioStream['codec_name'] !== 'aac') return false
|
||||||
|
|
||||||
|
const audioBitrate = parsedAudio.bitrate
|
||||||
|
if (!audioBitrate) return false
|
||||||
|
|
||||||
|
const maxAudioBitrate = getMaxAudioBitrate('aac', audioBitrate)
|
||||||
|
if (maxAudioBitrate !== -1 && audioBitrate > maxAudioBitrate) return false
|
||||||
|
|
||||||
|
const channelLayout = parsedAudio.audioStream['channel_layout']
|
||||||
|
// Causes playback issues with Chrome
|
||||||
|
if (!channelLayout || channelLayout === 'unknown') return false
|
||||||
|
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
export {
|
||||||
|
getVideoStreamSize,
|
||||||
|
getVideoFileResolution,
|
||||||
|
getMetadataFromFile,
|
||||||
|
getMaxAudioBitrate,
|
||||||
|
getVideoStreamFromFile,
|
||||||
|
getDurationFromVideoFile,
|
||||||
|
getAudioStream,
|
||||||
|
getVideoFileFPS,
|
||||||
|
ffprobePromise,
|
||||||
|
getVideoFileBitrate,
|
||||||
|
canDoQuickAudioTranscode
|
||||||
|
}
|
@ -3,7 +3,7 @@
|
|||||||
import { expect } from 'chai'
|
import { expect } from 'chai'
|
||||||
import { pathExists, readFile } from 'fs-extra'
|
import { pathExists, readFile } from 'fs-extra'
|
||||||
import { join } from 'path'
|
import { join } from 'path'
|
||||||
import { root } from '@server/helpers/core-utils'
|
import { root } from '@shared/core-utils'
|
||||||
import { HttpStatusCode } from '@shared/models'
|
import { HttpStatusCode } from '@shared/models'
|
||||||
import { makeGetRequest } from '../requests'
|
import { makeGetRequest } from '../requests'
|
||||||
import { PeerTubeServer } from '../server'
|
import { PeerTubeServer } from '../server'
|
||||||
|
@ -2,7 +2,7 @@ import { expect } from 'chai'
|
|||||||
import ffmpeg from 'fluent-ffmpeg'
|
import ffmpeg from 'fluent-ffmpeg'
|
||||||
import { ensureDir, pathExists } from 'fs-extra'
|
import { ensureDir, pathExists } from 'fs-extra'
|
||||||
import { dirname } from 'path'
|
import { dirname } from 'path'
|
||||||
import { getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '@server/helpers/ffprobe-utils'
|
import { getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '@shared/extra-utils/ffprobe'
|
||||||
import { getMaxBitrate } from '@shared/core-utils'
|
import { getMaxBitrate } from '@shared/core-utils'
|
||||||
import { buildAbsoluteFixturePath } from './tests'
|
import { buildAbsoluteFixturePath } from './tests'
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
import { expect } from 'chai'
|
import { expect } from 'chai'
|
||||||
import { pathExists, readdir } from 'fs-extra'
|
import { pathExists, readdir } from 'fs-extra'
|
||||||
import { join } from 'path'
|
import { join } from 'path'
|
||||||
import { root } from '@server/helpers/core-utils'
|
import { root } from '@shared/core-utils'
|
||||||
import { PeerTubeServer } from './server'
|
import { PeerTubeServer } from './server'
|
||||||
|
|
||||||
async function checkTmpIsEmpty (server: PeerTubeServer) {
|
async function checkTmpIsEmpty (server: PeerTubeServer) {
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
import { readJSON, writeJSON } from 'fs-extra'
|
import { readJSON, writeJSON } from 'fs-extra'
|
||||||
import { join } from 'path'
|
import { join } from 'path'
|
||||||
import { root } from '@server/helpers/core-utils'
|
import { root } from '@shared/core-utils'
|
||||||
import {
|
import {
|
||||||
HttpStatusCode,
|
HttpStatusCode,
|
||||||
PeerTubePlugin,
|
PeerTubePlugin,
|
||||||
|
@ -1,8 +1,7 @@
|
|||||||
import { ChildProcess, fork } from 'child_process'
|
import { ChildProcess, fork } from 'child_process'
|
||||||
import { copy } from 'fs-extra'
|
import { copy } from 'fs-extra'
|
||||||
import { join } from 'path'
|
import { join } from 'path'
|
||||||
import { root } from '@server/helpers/core-utils'
|
import { root, randomInt } from '@shared/core-utils'
|
||||||
import { randomInt } from '@shared/core-utils'
|
|
||||||
import { Video, VideoChannel, VideoCreateResult, VideoDetails } from '../../models/videos'
|
import { Video, VideoChannel, VideoCreateResult, VideoDetails } from '../../models/videos'
|
||||||
import { BulkCommand } from '../bulk'
|
import { BulkCommand } from '../bulk'
|
||||||
import { CLICommand } from '../cli'
|
import { CLICommand } from '../cli'
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { exec } from 'child_process'
|
import { exec } from 'child_process'
|
||||||
import { copy, ensureDir, readFile, remove } from 'fs-extra'
|
import { copy, ensureDir, readFile, remove } from 'fs-extra'
|
||||||
import { basename, join } from 'path'
|
import { basename, join } from 'path'
|
||||||
import { root } from '@server/helpers/core-utils'
|
import { root } from '@shared/core-utils'
|
||||||
import { HttpStatusCode } from '@shared/models'
|
import { HttpStatusCode } from '@shared/models'
|
||||||
import { getFileSize, isGithubCI, wait } from '../miscs'
|
import { getFileSize, isGithubCI, wait } from '../miscs'
|
||||||
import { AbstractCommand, OverrideCommandOptions } from '../shared'
|
import { AbstractCommand, OverrideCommandOptions } from '../shared'
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { expect } from 'chai'
|
import { expect } from 'chai'
|
||||||
import { sha1 } from '@server/helpers/core-utils'
|
import { sha1 } from '@shared/core-utils/crypto'
|
||||||
import { makeGetRequest } from '../requests'
|
import { makeGetRequest } from '../requests'
|
||||||
|
|
||||||
async function hlsInfohashExist (serverUrl: string, masterPlaylistUrl: string, fileNumber: number) {
|
async function hlsInfohashExist (serverUrl: string, masterPlaylistUrl: string, fileNumber: number) {
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
import { expect } from 'chai'
|
import { expect } from 'chai'
|
||||||
import { pathExists, readdir } from 'fs-extra'
|
import { pathExists, readdir } from 'fs-extra'
|
||||||
import { join } from 'path'
|
import { join } from 'path'
|
||||||
import { root } from '@server/helpers/core-utils'
|
import { root } from '@shared/core-utils'
|
||||||
import { Account, VideoChannel } from '@shared/models'
|
import { Account, VideoChannel } from '@shared/models'
|
||||||
import { PeerTubeServer } from '../server'
|
import { PeerTubeServer } from '../server'
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { expect } from 'chai'
|
import { expect } from 'chai'
|
||||||
import { basename } from 'path'
|
import { basename } from 'path'
|
||||||
import { sha256 } from '@server/helpers/core-utils'
|
import { sha256 } from '@shared/core-utils/crypto'
|
||||||
import { removeFragmentedMP4Ext } from '@shared/core-utils'
|
import { removeFragmentedMP4Ext } from '@shared/core-utils'
|
||||||
import { HttpStatusCode, VideoStreamingPlaylist } from '@shared/models'
|
import { HttpStatusCode, VideoStreamingPlaylist } from '@shared/models'
|
||||||
import { PeerTubeServer } from '../server'
|
import { PeerTubeServer } from '../server'
|
||||||
|
@ -5,8 +5,7 @@ import { createReadStream, stat } from 'fs-extra'
|
|||||||
import got, { Response as GotResponse } from 'got'
|
import got, { Response as GotResponse } from 'got'
|
||||||
import { omit } from 'lodash'
|
import { omit } from 'lodash'
|
||||||
import validator from 'validator'
|
import validator from 'validator'
|
||||||
import { buildUUID } from '@server/helpers/uuid'
|
import { buildUUID } from '@shared/core-utils/uuid'
|
||||||
import { loadLanguages } from '@server/initializers/constants'
|
|
||||||
import { pick } from '@shared/core-utils'
|
import { pick } from '@shared/core-utils'
|
||||||
import {
|
import {
|
||||||
HttpStatusCode,
|
HttpStatusCode,
|
||||||
@ -23,7 +22,7 @@ import {
|
|||||||
} from '@shared/models'
|
} from '@shared/models'
|
||||||
import { buildAbsoluteFixturePath, wait } from '../miscs'
|
import { buildAbsoluteFixturePath, wait } from '../miscs'
|
||||||
import { unwrapBody } from '../requests'
|
import { unwrapBody } from '../requests'
|
||||||
import { PeerTubeServer, waitJobs } from '../server'
|
import { waitJobs } from '../server'
|
||||||
import { AbstractCommand, OverrideCommandOptions } from '../shared'
|
import { AbstractCommand, OverrideCommandOptions } from '../shared'
|
||||||
|
|
||||||
export type VideoEdit = Partial<Omit<VideoCreate, 'thumbnailfile' | 'previewfile'>> & {
|
export type VideoEdit = Partial<Omit<VideoCreate, 'thumbnailfile' | 'previewfile'>> & {
|
||||||
@ -33,13 +32,6 @@ export type VideoEdit = Partial<Omit<VideoCreate, 'thumbnailfile' | 'previewfile
|
|||||||
}
|
}
|
||||||
|
|
||||||
export class VideosCommand extends AbstractCommand {
|
export class VideosCommand extends AbstractCommand {
|
||||||
|
|
||||||
constructor (server: PeerTubeServer) {
|
|
||||||
super(server)
|
|
||||||
|
|
||||||
loadLanguages()
|
|
||||||
}
|
|
||||||
|
|
||||||
getCategories (options: OverrideCommandOptions = {}) {
|
getCategories (options: OverrideCommandOptions = {}) {
|
||||||
const path = '/api/v1/videos/categories'
|
const path = '/api/v1/videos/categories'
|
||||||
|
|
||||||
|
@ -3,12 +3,7 @@
|
|||||||
import { expect } from 'chai'
|
import { expect } from 'chai'
|
||||||
import { pathExists, readdir } from 'fs-extra'
|
import { pathExists, readdir } from 'fs-extra'
|
||||||
import { basename, join } from 'path'
|
import { basename, join } from 'path'
|
||||||
import { getLowercaseExtension } from '@server/helpers/core-utils'
|
|
||||||
import { uuidRegex } from '@shared/core-utils'
|
|
||||||
import { HttpStatusCode, VideoCaption, VideoDetails } from '@shared/models'
|
import { HttpStatusCode, VideoCaption, VideoDetails } from '@shared/models'
|
||||||
import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../server/initializers/constants'
|
|
||||||
import { dateIsValid, testImage, webtorrentAdd } from '../miscs'
|
|
||||||
import { makeRawRequest } from '../requests/requests'
|
|
||||||
import { waitJobs } from '../server'
|
import { waitJobs } from '../server'
|
||||||
import { PeerTubeServer } from '../server/server'
|
import { PeerTubeServer } from '../server/server'
|
||||||
import { VideoEdit } from './videos-command'
|
import { VideoEdit } from './videos-command'
|
||||||
@ -85,150 +80,6 @@ function checkUploadVideoParam (
|
|||||||
: server.videos.buildResumeUpload({ token, attributes, expectedStatus })
|
: server.videos.buildResumeUpload({ token, attributes, expectedStatus })
|
||||||
}
|
}
|
||||||
|
|
||||||
async function completeVideoCheck (
|
|
||||||
server: PeerTubeServer,
|
|
||||||
video: any,
|
|
||||||
attributes: {
|
|
||||||
name: string
|
|
||||||
category: number
|
|
||||||
licence: number
|
|
||||||
language: string
|
|
||||||
nsfw: boolean
|
|
||||||
commentsEnabled: boolean
|
|
||||||
downloadEnabled: boolean
|
|
||||||
description: string
|
|
||||||
publishedAt?: string
|
|
||||||
support: string
|
|
||||||
originallyPublishedAt?: string
|
|
||||||
account: {
|
|
||||||
name: string
|
|
||||||
host: string
|
|
||||||
}
|
|
||||||
isLocal: boolean
|
|
||||||
tags: string[]
|
|
||||||
privacy: number
|
|
||||||
likes?: number
|
|
||||||
dislikes?: number
|
|
||||||
duration: number
|
|
||||||
channel: {
|
|
||||||
displayName: string
|
|
||||||
name: string
|
|
||||||
description: string
|
|
||||||
isLocal: boolean
|
|
||||||
}
|
|
||||||
fixture: string
|
|
||||||
files: {
|
|
||||||
resolution: number
|
|
||||||
size: number
|
|
||||||
}[]
|
|
||||||
thumbnailfile?: string
|
|
||||||
previewfile?: string
|
|
||||||
}
|
|
||||||
) {
|
|
||||||
if (!attributes.likes) attributes.likes = 0
|
|
||||||
if (!attributes.dislikes) attributes.dislikes = 0
|
|
||||||
|
|
||||||
const host = new URL(server.url).host
|
|
||||||
const originHost = attributes.account.host
|
|
||||||
|
|
||||||
expect(video.name).to.equal(attributes.name)
|
|
||||||
expect(video.category.id).to.equal(attributes.category)
|
|
||||||
expect(video.category.label).to.equal(attributes.category !== null ? VIDEO_CATEGORIES[attributes.category] : 'Misc')
|
|
||||||
expect(video.licence.id).to.equal(attributes.licence)
|
|
||||||
expect(video.licence.label).to.equal(attributes.licence !== null ? VIDEO_LICENCES[attributes.licence] : 'Unknown')
|
|
||||||
expect(video.language.id).to.equal(attributes.language)
|
|
||||||
expect(video.language.label).to.equal(attributes.language !== null ? VIDEO_LANGUAGES[attributes.language] : 'Unknown')
|
|
||||||
expect(video.privacy.id).to.deep.equal(attributes.privacy)
|
|
||||||
expect(video.privacy.label).to.deep.equal(VIDEO_PRIVACIES[attributes.privacy])
|
|
||||||
expect(video.nsfw).to.equal(attributes.nsfw)
|
|
||||||
expect(video.description).to.equal(attributes.description)
|
|
||||||
expect(video.account.id).to.be.a('number')
|
|
||||||
expect(video.account.host).to.equal(attributes.account.host)
|
|
||||||
expect(video.account.name).to.equal(attributes.account.name)
|
|
||||||
expect(video.channel.displayName).to.equal(attributes.channel.displayName)
|
|
||||||
expect(video.channel.name).to.equal(attributes.channel.name)
|
|
||||||
expect(video.likes).to.equal(attributes.likes)
|
|
||||||
expect(video.dislikes).to.equal(attributes.dislikes)
|
|
||||||
expect(video.isLocal).to.equal(attributes.isLocal)
|
|
||||||
expect(video.duration).to.equal(attributes.duration)
|
|
||||||
expect(video.url).to.contain(originHost)
|
|
||||||
expect(dateIsValid(video.createdAt)).to.be.true
|
|
||||||
expect(dateIsValid(video.publishedAt)).to.be.true
|
|
||||||
expect(dateIsValid(video.updatedAt)).to.be.true
|
|
||||||
|
|
||||||
if (attributes.publishedAt) {
|
|
||||||
expect(video.publishedAt).to.equal(attributes.publishedAt)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (attributes.originallyPublishedAt) {
|
|
||||||
expect(video.originallyPublishedAt).to.equal(attributes.originallyPublishedAt)
|
|
||||||
} else {
|
|
||||||
expect(video.originallyPublishedAt).to.be.null
|
|
||||||
}
|
|
||||||
|
|
||||||
const videoDetails = await server.videos.get({ id: video.uuid })
|
|
||||||
|
|
||||||
expect(videoDetails.files).to.have.lengthOf(attributes.files.length)
|
|
||||||
expect(videoDetails.tags).to.deep.equal(attributes.tags)
|
|
||||||
expect(videoDetails.account.name).to.equal(attributes.account.name)
|
|
||||||
expect(videoDetails.account.host).to.equal(attributes.account.host)
|
|
||||||
expect(video.channel.displayName).to.equal(attributes.channel.displayName)
|
|
||||||
expect(video.channel.name).to.equal(attributes.channel.name)
|
|
||||||
expect(videoDetails.channel.host).to.equal(attributes.account.host)
|
|
||||||
expect(videoDetails.channel.isLocal).to.equal(attributes.channel.isLocal)
|
|
||||||
expect(dateIsValid(videoDetails.channel.createdAt.toString())).to.be.true
|
|
||||||
expect(dateIsValid(videoDetails.channel.updatedAt.toString())).to.be.true
|
|
||||||
expect(videoDetails.commentsEnabled).to.equal(attributes.commentsEnabled)
|
|
||||||
expect(videoDetails.downloadEnabled).to.equal(attributes.downloadEnabled)
|
|
||||||
|
|
||||||
for (const attributeFile of attributes.files) {
|
|
||||||
const file = videoDetails.files.find(f => f.resolution.id === attributeFile.resolution)
|
|
||||||
expect(file).not.to.be.undefined
|
|
||||||
|
|
||||||
let extension = getLowercaseExtension(attributes.fixture)
|
|
||||||
// Transcoding enabled: extension will always be .mp4
|
|
||||||
if (attributes.files.length > 1) extension = '.mp4'
|
|
||||||
|
|
||||||
expect(file.magnetUri).to.have.lengthOf.above(2)
|
|
||||||
|
|
||||||
expect(file.torrentDownloadUrl).to.match(new RegExp(`http://${host}/download/torrents/${uuidRegex}-${file.resolution.id}.torrent`))
|
|
||||||
expect(file.torrentUrl).to.match(new RegExp(`http://${host}/lazy-static/torrents/${uuidRegex}-${file.resolution.id}.torrent`))
|
|
||||||
|
|
||||||
expect(file.fileUrl).to.match(new RegExp(`http://${originHost}/static/webseed/${uuidRegex}-${file.resolution.id}${extension}`))
|
|
||||||
expect(file.fileDownloadUrl).to.match(new RegExp(`http://${originHost}/download/videos/${uuidRegex}-${file.resolution.id}${extension}`))
|
|
||||||
|
|
||||||
await Promise.all([
|
|
||||||
makeRawRequest(file.torrentUrl, 200),
|
|
||||||
makeRawRequest(file.torrentDownloadUrl, 200),
|
|
||||||
makeRawRequest(file.metadataUrl, 200)
|
|
||||||
])
|
|
||||||
|
|
||||||
expect(file.resolution.id).to.equal(attributeFile.resolution)
|
|
||||||
expect(file.resolution.label).to.equal(attributeFile.resolution + 'p')
|
|
||||||
|
|
||||||
const minSize = attributeFile.size - ((10 * attributeFile.size) / 100)
|
|
||||||
const maxSize = attributeFile.size + ((10 * attributeFile.size) / 100)
|
|
||||||
expect(
|
|
||||||
file.size,
|
|
||||||
'File size for resolution ' + file.resolution.label + ' outside confidence interval (' + minSize + '> size <' + maxSize + ')'
|
|
||||||
).to.be.above(minSize).and.below(maxSize)
|
|
||||||
|
|
||||||
const torrent = await webtorrentAdd(file.magnetUri, true)
|
|
||||||
expect(torrent.files).to.be.an('array')
|
|
||||||
expect(torrent.files.length).to.equal(1)
|
|
||||||
expect(torrent.files[0].path).to.exist.and.to.not.equal('')
|
|
||||||
expect(torrent.files[0].name).to.equal(`${videoDetails.name} ${file.resolution.id}p${extension}`)
|
|
||||||
}
|
|
||||||
|
|
||||||
expect(videoDetails.thumbnailPath).to.exist
|
|
||||||
await testImage(server.url, attributes.thumbnailfile || attributes.fixture, videoDetails.thumbnailPath)
|
|
||||||
|
|
||||||
if (attributes.previewfile) {
|
|
||||||
expect(videoDetails.previewPath).to.exist
|
|
||||||
await testImage(server.url, attributes.previewfile, videoDetails.previewPath)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// serverNumber starts from 1
|
// serverNumber starts from 1
|
||||||
async function uploadRandomVideoOnServers (
|
async function uploadRandomVideoOnServers (
|
||||||
servers: PeerTubeServer[],
|
servers: PeerTubeServer[],
|
||||||
@ -247,7 +98,6 @@ async function uploadRandomVideoOnServers (
|
|||||||
|
|
||||||
export {
|
export {
|
||||||
checkUploadVideoParam,
|
checkUploadVideoParam,
|
||||||
completeVideoCheck,
|
|
||||||
uploadRandomVideoOnServers,
|
uploadRandomVideoOnServers,
|
||||||
checkVideoFilesWereRemoved,
|
checkVideoFilesWereRemoved,
|
||||||
saveVideoInServers
|
saveVideoInServers
|
||||||
|
6
shared/tsconfig.json
Normal file
6
shared/tsconfig.json
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"extends": "../tsconfig.base.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"outDir": "../dist/shared"
|
||||||
|
}
|
||||||
|
}
|
35
tsconfig.base.json
Normal file
35
tsconfig.base.json
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"module": "commonjs",
|
||||||
|
"target": "es2015",
|
||||||
|
"noImplicitAny": false,
|
||||||
|
"sourceMap": false,
|
||||||
|
"experimentalDecorators": true,
|
||||||
|
"emitDecoratorMetadata": true,
|
||||||
|
"importHelpers": true,
|
||||||
|
"removeComments": true,
|
||||||
|
"strictBindCallApply": true,
|
||||||
|
"esModuleInterop": true,
|
||||||
|
"forceConsistentCasingInFileNames": true,
|
||||||
|
"lib": [
|
||||||
|
"es2015",
|
||||||
|
"es2016",
|
||||||
|
"es2017",
|
||||||
|
"es2018",
|
||||||
|
"es2019"
|
||||||
|
],
|
||||||
|
"typeRoots": [
|
||||||
|
"node_modules/@types",
|
||||||
|
],
|
||||||
|
"baseUrl": "./",
|
||||||
|
"outDir": "./dist/",
|
||||||
|
"paths": {
|
||||||
|
"@server/*": [ "server/*" ],
|
||||||
|
"@shared/*": [ "shared/*" ]
|
||||||
|
},
|
||||||
|
"resolveJsonModule": true,
|
||||||
|
"strict": false,
|
||||||
|
"skipLibCheck": true,
|
||||||
|
"composite": true
|
||||||
|
}
|
||||||
|
}
|
@ -1,46 +1,9 @@
|
|||||||
{
|
{
|
||||||
"compilerOptions": {
|
"extends": "./tsconfig.base.json",
|
||||||
"module": "commonjs",
|
"references": [
|
||||||
"target": "es2015",
|
{ "path": "./shared" },
|
||||||
"noImplicitAny": false,
|
{ "path": "./server" },
|
||||||
"sourceMap": false,
|
{ "path": "./scripts" }
|
||||||
"experimentalDecorators": true,
|
],
|
||||||
"emitDecoratorMetadata": true,
|
"files": ["server.ts"]
|
||||||
"importHelpers": true,
|
|
||||||
"removeComments": true,
|
|
||||||
"strictBindCallApply": true,
|
|
||||||
"esModuleInterop": true,
|
|
||||||
"forceConsistentCasingInFileNames": true,
|
|
||||||
"outDir": "./dist",
|
|
||||||
"lib": [
|
|
||||||
"dom",
|
|
||||||
"es2015",
|
|
||||||
"es2016",
|
|
||||||
"es2017",
|
|
||||||
"es2018",
|
|
||||||
"es2019"
|
|
||||||
],
|
|
||||||
"typeRoots": [
|
|
||||||
"node_modules/@types",
|
|
||||||
"server/typings"
|
|
||||||
],
|
|
||||||
"baseUrl": "./",
|
|
||||||
"paths": {
|
|
||||||
"@server/*": [ "server/*" ],
|
|
||||||
"@shared/*": [ "shared/*" ]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"exclude": [
|
|
||||||
"server/tools/",
|
|
||||||
"node_modules",
|
|
||||||
"dist",
|
|
||||||
"storage",
|
|
||||||
"client",
|
|
||||||
"test1",
|
|
||||||
"test2",
|
|
||||||
"test3",
|
|
||||||
"test4",
|
|
||||||
"test5",
|
|
||||||
"test6"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
19
tsconfig.types.json
Normal file
19
tsconfig.types.json
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
{
|
||||||
|
"extends": "./tsconfig.base.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"incremental": true,
|
||||||
|
"sourceMap": true,
|
||||||
|
"stripInternal": true,
|
||||||
|
"removeComments": false,
|
||||||
|
"declaration": true,
|
||||||
|
"declarationMap": true,
|
||||||
|
"emitDeclarationOnly": true
|
||||||
|
},
|
||||||
|
"references": [
|
||||||
|
{ "path": "./shared/tsconfig.types.json" },
|
||||||
|
{ "path": "./server/tsconfig.types.json" },
|
||||||
|
{ "path": "./scripts/tsconfig.types.json" }
|
||||||
|
],
|
||||||
|
"files": []
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user