Update ffmpeg static version for tests

.github/workflows/test.yml

@@ -55,7 +55,7 @@ jobs:
       - name: Setup system dependencies
         run: |
           sudo apt-get install postgresql-client-common redis-tools parallel
-          wget --quiet --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-4.0.3-64bit-static.tar.xz"
+          wget --quiet --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-4.3.1-64bit-static.tar.xz"
           tar xf ffmpeg-release-4.0.3-64bit-static.tar.xz
           mkdir -p $HOME/bin
           cp ffmpeg-*/{ffmpeg,ffprobe} $HOME/bin

server/initializers/constants.ts

@@ -316,7 +316,7 @@ const CONSTRAINTS_FIELDS = {
   }
 }
 
-let VIEW_LIFETIME = {
+const VIEW_LIFETIME = {
   VIDEO: 60000 * 60, // 1 hour
   LIVE: 60000 * 5 // 5 minutes
 }

server/lib/activitypub/process/process-view.ts

@@ -31,15 +31,17 @@ async function processCreateView (activity: ActivityView | ActivityCreate, byAct
   }
   const { video } = await getOrCreateVideoAndAccountAndChannel(options)
 
+  if (!video.isLive) {
+    await Redis.Instance.addVideoView(video.id)
+  }
+
   if (video.isOwned()) {
     // Our live manager will increment the counter and send the view to followers
     if (video.isLive) {
       LiveManager.Instance.addViewTo(video.id)
       return
     }
 
-    await Redis.Instance.addVideoView(video.id)
-
     // Forward the view but don't resend the activity to the sender
     const exceptions = [ byActor ]
     await forwardVideoRelatedActivity(activity, undefined, exceptions, video)

server/tests/api/live/live.ts

@@ -121,7 +121,7 @@ describe('Test live', function () {
         const live: LiveVideo = resLive.body
 
         if (server.url === servers[0].url) {
-          expect(live.rtmpUrl).to.equal('rtmp://' + server.hostname + ':1936/live')
+          expect(live.rtmpUrl).to.equal('rtmp://' + server.hostname + ':' + server.rtmpPort + '/live')
           expect(live.streamKey).to.not.be.empty
         } else {
           expect(live.rtmpUrl).to.be.null
@@ -185,7 +185,7 @@ describe('Test live', function () {
         const live: LiveVideo = res.body
 
         if (server.url === servers[0].url) {
-          expect(live.rtmpUrl).to.equal('rtmp://' + server.hostname + ':1936/live')
+          expect(live.rtmpUrl).to.equal('rtmp://' + server.hostname + ':' + server.rtmpPort + '/live')
           expect(live.streamKey).to.not.be.empty
         } else {
           expect(live.rtmpUrl).to.be.null
@@ -216,7 +216,7 @@ describe('Test live', function () {
     let rtmpUrl: string
 
     before(function () {
-      rtmpUrl = 'rtmp://' + servers[0].hostname + ':1936'
+      rtmpUrl = 'rtmp://' + servers[0].hostname + ':' + server.rtmpPort + ''
     })
 
     async function createLiveWrapper () {

server/tests/api/videos/videos-views-cleaner.ts

@@ -61,14 +61,14 @@ describe('Test video views cleaner', function () {
     {
       for (const server of servers) {
         const total = await countVideoViewsOf(server.internalServerNumber, videoIdServer1)
-        expect(total).to.equal(2)
+        expect(total).to.equal(2, 'Server ' + server.serverNumber + ' does not have the correct amount of views')
       }
     }
 
     {
       for (const server of servers) {
         const total = await countVideoViewsOf(server.internalServerNumber, videoIdServer2)
-        expect(total).to.equal(2)
+        expect(total).to.equal(2, 'Server ' + server.serverNumber + ' does not have the correct amount of views')
       }
     }
   })

server/tests/plugins/plugin-helpers.ts

@@ -80,7 +80,7 @@ describe('Test plugin helpers', function () {
     let videoUUIDServer1: string
 
     before(async function () {
-      this.timeout(15000)
+      this.timeout(30000)
 
       {
         const res = await uploadVideoAndGetId({ server: servers[0], videoName: 'video server 1' })

shared/extra-utils/server/servers.ts

@@ -7,6 +7,7 @@ import { copy, pathExists, readdir, readFile, remove } from 'fs-extra'
 import { expect } from 'chai'
 import { VideoChannel } from '../../models/videos'
 import { randomInt } from '../../core-utils/miscs/miscs'
+import { isNpmPluginNameValid } from '@server/helpers/custom-validators/plugins'
 
 interface ServerInfo {
   app: ChildProcess
@@ -16,6 +17,8 @@ interface ServerInfo {
   hostname: string
   port: number
 
+  rtmpPort: number
+
   parallel: boolean
   internalServerNumber: number
   serverNumber: number
@@ -95,10 +98,18 @@ function randomServer () {
   return randomInt(low, high)
 }
 
+function randomRTMP () {
+  const low = 1900
+  const high = 2100
+
+  return randomInt(low, high)
+}
+
 async function flushAndRunServer (serverNumber: number, configOverride?: Object, args = []) {
   const parallel = parallelTests()
 
   const internalServerNumber = parallel ? randomServer() : serverNumber
+  const rtmpPort = parallel ? randomRTMP() : null
   const port = 9000 + internalServerNumber
 
   await flushTests(internalServerNumber)
@@ -107,6 +118,7 @@ async function flushAndRunServer (serverNumber: number, configOverride?: Object,
     app: null,
     port,
     internalServerNumber,
+    rtmpPort,
     parallel,
     serverNumber,
     url: `http://localhost:${port}`,
@@ -178,6 +190,9 @@ async function runServer (server: ServerInfo, configOverrideArg?: any, args = []
       },
       admin: {
         email: `admin${server.internalServerNumber}@example.com`
+      },
+      live: {
+        port: server.rtmpPort
       }
     })
   }