X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=shared%2Fextra-utils%2Fserver%2Fservers.ts;h=fe4ed3e485691d5523655845e3101cfed4a65fcc;hb=c9bc850e93295661e743255b8623ac8e2a95c391;hp=4c7d6862ae8d1bbc1694463acba812062a4e5043;hpb=86aafd06f2d124786ea3d10477f356c2e3f85dd6;p=github%2FChocobozzz%2FPeerTube.git diff --git a/shared/extra-utils/server/servers.ts b/shared/extra-utils/server/servers.ts index 4c7d6862a..fe4ed3e48 100644 --- a/shared/extra-utils/server/servers.ts +++ b/shared/extra-utils/server/servers.ts @@ -1,32 +1,35 @@ -/* tslint:disable:no-unused-expression */ +/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/no-floating-promises */ +import { expect } from 'chai' import { ChildProcess, exec, fork } from 'child_process' +import { copy, ensureDir, pathExists, readdir, readFile, remove } from 'fs-extra' import { join } from 'path' -import { root, wait } from '../miscs/miscs' -import { copy, readdir, readFile, remove } from 'fs-extra' -import { existsSync } from 'fs' -import { expect } from 'chai' -import { VideoChannel } from '../../models/videos' import { randomInt } from '../../core-utils/miscs/miscs' +import { VideoChannel } from '../../models/videos' +import { buildServerDirectory, getFileSize, isGithubCI, root, wait } from '../miscs/miscs' interface ServerInfo { - app: ChildProcess, + app: ChildProcess + url: string host: string - + hostname: string port: number + + rtmpPort: number + parallel: boolean internalServerNumber: number serverNumber: number client: { - id: string, + id: string secret: string } user: { - username: string, - password: string, + username: string + password: string email?: string } @@ -38,8 +41,9 @@ interface ServerInfo { video?: { id: number uuid: string - name: string - account: { + name?: string + url?: string + account?: { name: string } } @@ -57,7 +61,7 @@ function parallelTests () { } function flushAndRunMultipleServers (totalServers: number, configOverride?: Object) { - let apps = [] + const apps = [] let i = 0 return new Promise(res => { @@ -79,8 +83,8 @@ function flushTests (serverNumber?: number) { return new Promise((res, rej) => { const suffix = serverNumber ? ` -- ${serverNumber}` : '' - return exec('npm run clean:server:test' + suffix, err => { - if (err) return rej(err) + return exec('npm run clean:server:test' + suffix, (err, _stdout, stderr) => { + if (err || stderr) return rej(err || new Error(stderr)) return res() }) @@ -94,10 +98,23 @@ function randomServer () { return randomInt(low, high) } -async function flushAndRunServer (serverNumber: number, configOverride?: Object, args = []) { +function randomRTMP () { + const low = 1900 + const high = 2100 + + return randomInt(low, high) +} + +type RunServerOptions = { + hideLogs?: boolean + execArgv?: string[] +} + +async function flushAndRunServer (serverNumber: number, configOverride?: Object, args = [], options: RunServerOptions = {}) { const parallel = parallelTests() const internalServerNumber = parallel ? randomServer() : serverNumber + const rtmpPort = parallel ? randomRTMP() : 1936 const port = 9000 + internalServerNumber await flushTests(internalServerNumber) @@ -106,10 +123,12 @@ async function flushAndRunServer (serverNumber: number, configOverride?: Object, app: null, port, internalServerNumber, + rtmpPort, parallel, serverNumber, url: `http://localhost:${port}`, host: `localhost:${port}`, + hostname: 'localhost', client: { id: null, secret: null @@ -120,10 +139,10 @@ async function flushAndRunServer (serverNumber: number, configOverride?: Object, } } - return runServer(server, configOverride, args) + return runServer(server, configOverride, args, options) } -async function runServer (server: ServerInfo, configOverrideArg?: any, args = []) { +async function runServer (server: ServerInfo, configOverrideArg?: any, args = [], options: RunServerOptions = {}) { // These actions are async so we need to be sure that they have both been done const serverRunString = { 'Server listening': false @@ -171,10 +190,16 @@ async function runServer (server: ServerInfo, configOverrideArg?: any, args = [] thumbnails: `test${server.internalServerNumber}/thumbnails/`, torrents: `test${server.internalServerNumber}/torrents/`, captions: `test${server.internalServerNumber}/captions/`, - cache: `test${server.internalServerNumber}/cache/` + cache: `test${server.internalServerNumber}/cache/`, + plugins: `test${server.internalServerNumber}/plugins/` }, admin: { email: `admin${server.internalServerNumber}@example.com` + }, + live: { + rtmp: { + port: server.rtmpPort + } } }) } @@ -189,39 +214,44 @@ async function runServer (server: ServerInfo, configOverrideArg?: any, args = [] env['NODE_APP_INSTANCE'] = server.internalServerNumber.toString() env['NODE_CONFIG'] = JSON.stringify(configOverride) - const options = { + const forkOptions = { silent: true, env, - detached: true + detached: true, + execArgv: options.execArgv || [] } return new Promise(res => { - server.app = fork(join(root(), 'dist', 'server.js'), args, options) + server.app = fork(join(root(), 'dist', 'server.js'), args, forkOptions) server.app.stdout.on('data', function onStdout (data) { let dontContinue = false // Capture things if we want to for (const key of Object.keys(regexps)) { - const regexp = regexps[ key ] + const regexp = regexps[key] const matches = data.toString().match(regexp) if (matches !== null) { - if (key === 'client_id') server.client.id = matches[ 1 ] - else if (key === 'client_secret') server.client.secret = matches[ 1 ] - else if (key === 'user_username') server.user.username = matches[ 1 ] - else if (key === 'user_password') server.user.password = matches[ 1 ] + if (key === 'client_id') server.client.id = matches[1] + else if (key === 'client_secret') server.client.secret = matches[1] + else if (key === 'user_username') server.user.username = matches[1] + else if (key === 'user_password') server.user.password = matches[1] } } // Check if all required sentences are here for (const key of Object.keys(serverRunString)) { - if (data.toString().indexOf(key) !== -1) serverRunString[ key ] = true - if (serverRunString[ key ] === false) dontContinue = true + if (data.toString().indexOf(key) !== -1) serverRunString[key] = true + if (serverRunString[key] === false) dontContinue = true } // If no, there is maybe one thing not already initialized (client/user credentials generation...) if (dontContinue === true) return - server.app.stdout.removeListener('data', onStdout) + if (options.hideLogs === false) { + console.log(data.toString()) + } else { + server.app.stdout.removeListener('data', onStdout) + } process.on('exit', () => { try { @@ -241,20 +271,22 @@ async function reRunServer (server: ServerInfo, configOverride?: any) { return server } -async function checkTmpIsEmpty (server: ServerInfo) { - return checkDirectoryIsEmpty(server, 'tmp') +function checkTmpIsEmpty (server: ServerInfo) { + return checkDirectoryIsEmpty(server, 'tmp', [ 'plugins-global.css' ]) } -async function checkDirectoryIsEmpty (server: ServerInfo, directory: string) { +async function checkDirectoryIsEmpty (server: ServerInfo, directory: string, exceptions: string[] = []) { const testDirectory = 'test' + server.internalServerNumber const directoryPath = join(root(), testDirectory, directory) - const directoryExists = existsSync(directoryPath) + const directoryExists = await pathExists(directoryPath) expect(directoryExists).to.be.true const files = await readdir(directoryPath) - expect(files).to.have.lengthOf(0) + const filtered = files.filter(f => exceptions.includes(f) === false) + + expect(filtered).to.have.lengthOf(0) } function killallServers (servers: ServerInfo[]) { @@ -266,11 +298,23 @@ function killallServers (servers: ServerInfo[]) { } } -function cleanupTests (servers: ServerInfo[]) { +async function cleanupTests (servers: ServerInfo[]) { killallServers(servers) + if (isGithubCI()) { + await ensureDir('artifacts') + } + const p: Promise[] = [] for (const server of servers) { + if (isGithubCI()) { + const origin = await buildServerDirectory(server, 'logs/peertube.log') + const destname = `peertube-${server.internalServerNumber}.log` + console.log('Saving logs %s.', destname) + + await copy(origin, join('artifacts', destname)) + } + if (server.parallel) { p.push(flushTests(server.internalServerNumber)) } @@ -283,24 +327,32 @@ function cleanupTests (servers: ServerInfo[]) { return Promise.all(p) } -async function waitUntilLog (server: ServerInfo, str: string, count = 1) { - const logfile = join(root(), 'test' + server.internalServerNumber, 'logs/peertube.log') +async function waitUntilLog (server: ServerInfo, str: string, count = 1, strictCount = true) { + const logfile = buildServerDirectory(server, 'logs/peertube.log') while (true) { const buf = await readFile(logfile) const matches = buf.toString().match(new RegExp(str, 'g')) if (matches && matches.length === count) return + if (matches && strictCount === false && matches.length >= count) return await wait(1000) } } +async function getServerFileSize (server: ServerInfo, subPath: string) { + const path = buildServerDirectory(server, subPath) + + return getFileSize(path) +} + // --------------------------------------------------------------------------- export { checkDirectoryIsEmpty, checkTmpIsEmpty, + getServerFileSize, ServerInfo, parallelTests, cleanupTests,