Introduce notifications command

[github/Chocobozzz/PeerTube.git] / shared / extra-utils / server / servers.ts

diff --git a/shared/extra-utils/server/servers.ts b/shared/extra-utils/server/servers.ts
index 68e10af5fd576e2377735c473b44fbebecf6a30b..e0e49d2c4b076c070e9cd74c92b8337ac1569136 100644 (file)
--- a/shared/extra-utils/server/servers.ts
+++ b/shared/extra-utils/server/servers.ts
@@ -11,13 +11,14 @@ import { CLICommand } from '../cli'
 import { CustomPagesCommand } from '../custom-pages'
 import { FeedCommand } from '../feeds'
 import { LogsCommand } from '../logs'
+import { SQLCommand } from '../miscs'
 import { buildServerDirectory, getFileSize, isGithubCI, root, wait } from '../miscs/miscs'
 import { AbusesCommand } from '../moderation'
 import { OverviewsCommand } from '../overviews'
 import { makeGetRequest } from '../requests/requests'
 import { SearchCommand } from '../search'
 import { SocketIOCommand } from '../socket'
-import { AccountsCommand, BlocklistCommand, SubscriptionsCommand } from '../users'
+import { AccountsCommand, BlocklistCommand, NotificationsCommand, SubscriptionsCommand } from '../users'
 import {
   BlacklistCommand,
   CaptionsCommand,
@@ -30,6 +31,7 @@ import {
   ServicesCommand,
   StreamingPlaylistsCommand
 } from '../videos'
+import { CommentsCommand } from '../videos/comments-command'
 import { ConfigCommand } from './config-command'
 import { ContactFormCommand } from './contact-form-command'
 import { DebugCommand } from './debug-command'
@@ -40,25 +42,25 @@ import { RedundancyCommand } from './redundancy-command'
 import { StatsCommand } from './stats-command'
 
 interface ServerInfo {
-  app: ChildProcess
+  app?: ChildProcess
 
   url: string
-  host: string
-  hostname: string
-  port: number
+  host?: string
+  hostname?: string
+  port?: number
 
-  rtmpPort: number
+  rtmpPort?: number
 
-  parallel: boolean
+  parallel?: boolean
   internalServerNumber: number
-  serverNumber: number
+  serverNumber?: number
 
-  client: {
-    id: string
-    secret: string
+  client?: {
+    id?: string
+    secret?: string
   }
 
-  user: {
+  user?: {
     username: string
     password: string
     email?: string
@@ -121,6 +123,9 @@ interface ServerInfo {
   importsCommand?: ImportsCommand
   streamingPlaylistsCommand?: StreamingPlaylistsCommand
   channelsCommand?: ChannelsCommand
+  commentsCommand?: CommentsCommand
+  sqlCommand?: SQLCommand
+  notificationsCommand?: NotificationsCommand
 }
 
 function parallelTests () {
@@ -326,42 +331,49 @@ async function runServer (server: ServerInfo, configOverrideArg?: any, args = []
         } catch { /* empty */ }
       })
 
-      server.bulkCommand = new BulkCommand(server)
-      server.cliCommand = new CLICommand(server)
-      server.customPageCommand = new CustomPagesCommand(server)
-      server.feedCommand = new FeedCommand(server)
-      server.logsCommand = new LogsCommand(server)
-      server.abusesCommand = new AbusesCommand(server)
-      server.overviewsCommand = new OverviewsCommand(server)
-      server.searchCommand = new SearchCommand(server)
-      server.contactFormCommand = new ContactFormCommand(server)
-      server.debugCommand = new DebugCommand(server)
-      server.followsCommand = new FollowsCommand(server)
-      server.jobsCommand = new JobsCommand(server)
-      server.pluginsCommand = new PluginsCommand(server)
-      server.redundancyCommand = new RedundancyCommand(server)
-      server.statsCommand = new StatsCommand(server)
-      server.configCommand = new ConfigCommand(server)
-      server.socketIOCommand = new SocketIOCommand(server)
-      server.accountsCommand = new AccountsCommand(server)
-      server.blocklistCommand = new BlocklistCommand(server)
-      server.subscriptionsCommand = new SubscriptionsCommand(server)
-      server.liveCommand = new LiveCommand(server)
-      server.servicesCommand = new ServicesCommand(server)
-      server.blacklistCommand = new BlacklistCommand(server)
-      server.captionsCommand = new CaptionsCommand(server)
-      server.changeOwnershipCommand = new ChangeOwnershipCommand(server)
-      server.playlistsCommand = new PlaylistsCommand(server)
-      server.historyCommand = new HistoryCommand(server)
-      server.importsCommand = new ImportsCommand(server)
-      server.streamingPlaylistsCommand = new StreamingPlaylistsCommand(server)
-      server.channelsCommand = new ChannelsCommand(server)
+      assignCommands(server)
 
       res(server)
     })
   })
 }
 
+function assignCommands (server: ServerInfo) {
+  server.bulkCommand = new BulkCommand(server)
+  server.cliCommand = new CLICommand(server)
+  server.customPageCommand = new CustomPagesCommand(server)
+  server.feedCommand = new FeedCommand(server)
+  server.logsCommand = new LogsCommand(server)
+  server.abusesCommand = new AbusesCommand(server)
+  server.overviewsCommand = new OverviewsCommand(server)
+  server.searchCommand = new SearchCommand(server)
+  server.contactFormCommand = new ContactFormCommand(server)
+  server.debugCommand = new DebugCommand(server)
+  server.followsCommand = new FollowsCommand(server)
+  server.jobsCommand = new JobsCommand(server)
+  server.pluginsCommand = new PluginsCommand(server)
+  server.redundancyCommand = new RedundancyCommand(server)
+  server.statsCommand = new StatsCommand(server)
+  server.configCommand = new ConfigCommand(server)
+  server.socketIOCommand = new SocketIOCommand(server)
+  server.accountsCommand = new AccountsCommand(server)
+  server.blocklistCommand = new BlocklistCommand(server)
+  server.subscriptionsCommand = new SubscriptionsCommand(server)
+  server.liveCommand = new LiveCommand(server)
+  server.servicesCommand = new ServicesCommand(server)
+  server.blacklistCommand = new BlacklistCommand(server)
+  server.captionsCommand = new CaptionsCommand(server)
+  server.changeOwnershipCommand = new ChangeOwnershipCommand(server)
+  server.playlistsCommand = new PlaylistsCommand(server)
+  server.historyCommand = new HistoryCommand(server)
+  server.importsCommand = new ImportsCommand(server)
+  server.streamingPlaylistsCommand = new StreamingPlaylistsCommand(server)
+  server.channelsCommand = new ChannelsCommand(server)
+  server.commentsCommand = new CommentsCommand(server)
+  server.sqlCommand = new SQLCommand(server)
+  server.notificationsCommand = new NotificationsCommand(server)
+}
+
 async function reRunServer (server: ServerInfo, configOverride?: any) {
   const newServer = await runServer(server, configOverride)
   server.app = newServer.app
@@ -391,17 +403,20 @@ async function checkDirectoryIsEmpty (server: ServerInfo, directory: string, exc
   expect(filtered).to.have.lengthOf(0)
 }
 
-function killallServers (servers: ServerInfo[]) {
+async function killallServers (servers: ServerInfo[]) {
   for (const server of servers) {
     if (!server.app) continue
 
+    await server.sqlCommand.cleanup()
+
     process.kill(-server.app.pid)
+
     server.app = null
   }
 }
 
 async function cleanupTests (servers: ServerInfo[]) {
-  killallServers(servers)
+  await killallServers(servers)
 
   if (isGithubCI()) {
     await ensureDir('artifacts')
@@ -472,5 +487,6 @@ export {
   flushAndRunServer,
   killallServers,
   reRunServer,
+  assignCommands,
   waitUntilLog
 }