Update server dependencies

[github/Chocobozzz/PeerTube.git] / server / lib / peertube-socket.ts

diff --git a/server/lib/peertube-socket.ts b/server/lib/peertube-socket.ts
index c918a8685d05856627c1b58b13471a2381d30309..5fc5bc20b70c2d77e494ccc5eca2d77d45ec3407 100644 (file)
--- a/server/lib/peertube-socket.ts
+++ b/server/lib/peertube-socket.ts
@@ -1,4 +1,3 @@
-import { Socket } from 'dgram'
 import { Server } from 'http'
 import * as SocketIO from 'socket.io'
 import { MVideo } from '@server/types/models'
@@ -6,6 +5,7 @@ import { UserNotificationModelForApi } from '@server/types/models/user'
 import { LiveVideoEventPayload, LiveVideoEventType } from '@shared/models'
 import { logger } from '../helpers/logger'
 import { authenticateSocket } from '../middlewares'
+import { isIdValid } from '@server/helpers/custom-validators/misc'
 
 class PeerTubeSocket {
 
@@ -17,7 +17,7 @@ class PeerTubeSocket {
   private constructor () {}
 
   init (server: Server) {
-    const io = SocketIO(server)
+    const io = new SocketIO.Server(server)
 
     io.of('/user-notifications')
       .use(authenticateSocket)
@@ -39,8 +39,17 @@ class PeerTubeSocket {
 
     this.liveVideosNamespace = io.of('/live-videos')
       .on('connection', socket => {
-        socket.on('subscribe', ({ videoId }) => socket.join(videoId))
-        socket.on('unsubscribe', ({ videoId }) => socket.leave(videoId))
+        socket.on('subscribe', ({ videoId }) => {
+          if (!isIdValid(videoId)) return
+
+          socket.join(videoId)
+        })
+
+        socket.on('unsubscribe', ({ videoId }) => {
+          if (!isIdValid(videoId)) return
+
+          socket.leave(videoId)
+        })
       })
   }