import { CustomPagesCommand } from '../custom-pages'
import { FeedCommand } from '../feeds'
import { LogsCommand } from '../logs'
-import { SQLCommand } from '../miscs'
import { AbusesCommand } from '../moderation'
import { OverviewsCommand } from '../overviews'
+import { RunnerJobsCommand, RunnerRegistrationTokensCommand, RunnersCommand } from '../runners'
import { SearchCommand } from '../search'
import { SocketIOCommand } from '../socket'
import {
BlocklistCommand,
LoginCommand,
NotificationsCommand,
+ RegistrationsCommand,
SubscriptionsCommand,
TwoFactorCommand,
UsersCommand
streamingPlaylists?: StreamingPlaylistsCommand
channels?: ChannelsCommand
comments?: CommentsCommand
- sql?: SQLCommand
notifications?: NotificationsCommand
servers?: ServersCommand
login?: LoginCommand
views?: ViewsCommand
twoFactor?: TwoFactorCommand
videoToken?: VideoTokenCommand
+ registrations?: RegistrationsCommand
+
+ runners?: RunnersCommand
+ runnerRegistrationTokens?: RunnerRegistrationTokensCommand
+ runnerJobs?: RunnerJobsCommand
constructor (options: { serverNumber: number } | { url: string }) {
if ((options as any).url) {
this.rtmpsPort = this.parallel ? this.randomRTMP() : 1937
this.port = 9000 + this.internalServerNumber
- this.url = `http://localhost:${this.port}`
- this.host = `localhost:${this.port}`
- this.hostname = 'localhost'
+ this.url = `http://127.0.0.1:${this.port}`
+ this.host = `127.0.0.1:${this.port}`
+ this.hostname = '127.0.0.1'
}
setUrl (url: string) {
return join(root(), testDirectory, directoryName)
}
- async flushAndRun (configOverride?: Object, options: RunServerOptions = {}) {
+ async flushAndRun (configOverride?: object, options: RunServerOptions = {}) {
await ServersCommand.flushTests(this.internalServerNumber)
return this.run(configOverride, options)
})
}
- async kill () {
- if (!this.app) return
-
- await this.sql.cleanup()
+ kill () {
+ if (!this.app) return Promise.resolve()
process.kill(-this.app.pid)
this.app = null
+
+ return Promise.resolve()
}
private randomServer () {
this.streamingPlaylists = new StreamingPlaylistsCommand(this)
this.channels = new ChannelsCommand(this)
this.comments = new CommentsCommand(this)
- this.sql = new SQLCommand(this)
this.notifications = new NotificationsCommand(this)
this.servers = new ServersCommand(this)
this.login = new LoginCommand(this)
this.views = new ViewsCommand(this)
this.twoFactor = new TwoFactorCommand(this)
this.videoToken = new VideoTokenCommand(this)
+ this.registrations = new RegistrationsCommand(this)
+
+ this.runners = new RunnersCommand(this)
+ this.runnerRegistrationTokens = new RunnerRegistrationTokensCommand(this)
+ this.runnerJobs = new RunnerJobsCommand(this)
}
}