X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fpeertube-socket.ts;h=0398ca61dbf8f71e68c52be44cbed4fe2023dd7b;hb=37ff5005b47b9df2933a0b8812609a6c41faa170;hp=e27963e606b52d6ea6c4ade1272000aec5f50441;hpb=a800dbf345e856ab790e7b3ab9a97e8c5dfa0a32;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/peertube-socket.ts b/server/lib/peertube-socket.ts
index e27963e60..0398ca61d 100644
--- a/server/lib/peertube-socket.ts
+++ b/server/lib/peertube-socket.ts
@@ -1,28 +1,28 @@
-import { Server } from 'http'
-import * as SocketIO from 'socket.io'
-import { MVideo } from '@server/types/models'
+import { Server as HTTPServer } from 'http'
+import { Namespace, Server as SocketServer, Socket } from 'socket.io'
+import { isIdValid } from '@server/helpers/custom-validators/misc'
+import { MVideo, MVideoImmutable } from '@server/types/models'
 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 {
 
   private static instance: PeerTubeSocket
 
-  private userNotificationSockets: { [ userId: number ]: SocketIO.Socket[] } = {}
-  private liveVideosNamespace: SocketIO.Namespace
+  private userNotificationSockets: { [ userId: number ]: Socket[] } = {}
+  private liveVideosNamespace: Namespace
 
   private constructor () {}
 
-  init (server: Server) {
-    const io = new SocketIO.Server(server)
+  init (server: HTTPServer) {
+    const io = new SocketServer(server)
 
     io.of('/user-notifications')
       .use(authenticateSocket)
       .on('connection', socket => {
-        const userId = socket.handshake.query.user.id
+        const userId = socket.handshake.auth.user.id
 
         logger.debug('User %d connected on the notification system.', userId)
 
@@ -42,12 +42,14 @@ class PeerTubeSocket {
         socket.on('subscribe', ({ videoId }) => {
           if (!isIdValid(videoId)) return
 
+          /* eslint-disable @typescript-eslint/no-floating-promises */
           socket.join(videoId)
         })
 
         socket.on('unsubscribe', ({ videoId }) => {
           if (!isIdValid(videoId)) return
 
+          /* eslint-disable @typescript-eslint/no-floating-promises */
           socket.leave(videoId)
         })
       })
@@ -76,11 +78,11 @@ class PeerTubeSocket {
       .emit(type, data)
   }
 
-  sendVideoViewsUpdate (video: MVideo) {
-    const data: LiveVideoEventPayload = { views: video.views }
+  sendVideoViewsUpdate (video: MVideoImmutable, numViewers: number) {
+    const data: LiveVideoEventPayload = { viewers: numViewers, views: numViewers }
     const type: LiveVideoEventType = 'views-change'
 
-    logger.debug('Sending video live views update notification of %s.', video.url, { views: video.views })
+    logger.debug('Sending video live views update notification of %s.', video.url, { viewers: numViewers })
 
     this.liveVideosNamespace
       .in(video.id)