X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftools%2Ftest-live.ts;h=27f2a4a92a204fbc9ce7b9041e51f1be105f7d36;hb=0d22b7ad5ffea0a830a266815f7bdfd8893917c9;hp=76fd6943598a168cfdf778fa675f0455aef07f5d;hpb=078f17e6d90376050f43ce639e88e11869b49ee7;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tools/test-live.ts b/server/tools/test-live.ts
index 76fd69435..27f2a4a92 100644
--- a/server/tools/test-live.ts
+++ b/server/tools/test-live.ts
@@ -1,10 +1,10 @@
 import { program } from 'commander'
 import { LiveVideoCreate, VideoPrivacy } from '@shared/models'
 import {
-  flushAndRunServer,
+  createSingleServer,
   killallServers,
   sendRTMPStream,
-  ServerInfo,
+  PeerTubeServer,
   setAccessTokensToServers,
   setDefaultVideoChannel
 } from '../../shared/extra-utils'
@@ -36,11 +36,11 @@ async function run () {
 
   console.log('Starting server.')
 
-  const server = await flushAndRunServer(1, {}, [], { hideLogs: false, execArgv: [ '--inspect' ] })
+  const server = await createSingleServer(1, {}, { hideLogs: false, nodeArgs: [ '--inspect' ] })
 
-  const cleanup = () => {
+  const cleanup = async () => {
     console.log('Killing server')
-    killallServers([ server ])
+    await killallServers([ server ])
   }
 
   process.on('exit', cleanup)
@@ -54,19 +54,19 @@ async function run () {
   const attributes: LiveVideoCreate = {
     name: 'live',
     saveReplay: true,
-    channelId: server.videoChannel.id,
+    channelId: server.store.channel.id,
     privacy: VideoPrivacy.PUBLIC
   }
 
   console.log('Creating live.')
 
-  const { uuid: liveVideoUUID } = await server.liveCommand.create({ fields: attributes })
+  const { uuid: liveVideoUUID } = await server.live.create({ fields: attributes })
 
-  const live = await server.liveCommand.get({ videoId: liveVideoUUID })
+  const live = await server.live.get({ videoId: liveVideoUUID })
 
   console.log('Sending RTMP stream.')
 
-  const ffmpegCommand = sendRTMPStream(live.rtmpUrl, live.streamKey)
+  const ffmpegCommand = sendRTMPStream({ rtmpBaseUrl: live.rtmpUrl, streamKey: live.streamKey })
 
   ffmpegCommand.on('error', err => {
     console.error(err)
@@ -81,8 +81,8 @@ async function run () {
 
 // ----------------------------------------------------------------------------
 
-async function buildConfig (server: ServerInfo, commandType: CommandType) {
-  await server.configCommand.updateCustomSubConfig({
+async function buildConfig (server: PeerTubeServer, commandType: CommandType) {
+  await server.config.updateCustomSubConfig({
     newConfig: {
       instance: {
         customizations: {