Merge branch 'release/4.1.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / core / notification / peertube-socket.service.ts

diff --git a/client/src/app/core/notification/peertube-socket.service.ts b/client/src/app/core/notification/peertube-socket.service.ts
index 8668c44a8b05f7e9dbc7d4142df23c134fbd59af..0db86d8e7fd71e3217682f77a2bfe82f95db0465 100644 (file)
--- a/client/src/app/core/notification/peertube-socket.service.ts
+++ b/client/src/app/core/notification/peertube-socket.service.ts
@@ -1,5 +1,6 @@
 import { Subject } from 'rxjs'
-import { Injectable, NgZone } from '@angular/core'
+import { io, Socket } from 'socket.io-client'
+import { Injectable } from '@angular/core'
 import { LiveVideoEventPayload, LiveVideoEventType, UserNotification as UserNotificationServer } from '@shared/models'
 import { environment } from '../../../environments/environment'
 import { AuthService } from '../auth'
@@ -8,17 +9,16 @@ export type NotificationEvent = 'new' | 'read' | 'read-all'
 
 @Injectable()
 export class PeerTubeSocket {
-  private io: typeof import ('socket.io-client')
+  private io: typeof io
 
   private notificationSubject = new Subject<{ type: NotificationEvent, notification?: UserNotificationServer }>()
   private liveVideosSubject = new Subject<{ type: LiveVideoEventType, payload: LiveVideoEventPayload }>()
 
-  private notificationSocket: SocketIOClient.Socket
-  private liveVideosSocket: SocketIOClient.Socket
+  private notificationSocket: Socket
+  private liveVideosSocket: Socket
 
   constructor (
-    private auth: AuthService,
-    private ngZone: NgZone
+    private auth: AuthService
   ) {}
 
   async getMyNotificationsSocket () {
@@ -37,7 +37,7 @@ export class PeerTubeSocket {
     this.liveVideosSocket.emit('subscribe', { videoId })
   }
 
-  async unsubscribeLiveVideos (videoId: number) {
+  unsubscribeLiveVideos (videoId: number) {
     if (!this.liveVideosSocket) return
 
     this.liveVideosSocket.emit('unsubscribe', { videoId })
@@ -52,12 +52,12 @@ export class PeerTubeSocket {
 
     await this.importIOIfNeeded()
 
-    this.ngZone.runOutsideAngular(() => {
-      this.notificationSocket = this.io(environment.apiUrl + '/user-notifications', {
-        query: { accessToken: this.auth.getAccessToken() }
-      })
+    this.notificationSocket = this.io(environment.apiUrl + '/user-notifications', {
+      query: { accessToken: this.auth.getAccessToken() }
+    })
 
-      this.notificationSocket.on('new-notification', (n: UserNotificationServer) => this.dispatchNotificationEvent('new', n))
+    this.notificationSocket.on('new-notification', (n: UserNotificationServer) => {
+      this.dispatchNotificationEvent('new', n)
     })
   }
 
@@ -66,18 +66,21 @@ export class PeerTubeSocket {
 
     await this.importIOIfNeeded()
 
-    this.ngZone.runOutsideAngular(() => {
-      this.liveVideosSocket = this.io(environment.apiUrl + '/live-videos')
+    this.liveVideosSocket = this.io(environment.apiUrl + '/live-videos')
 
-      const type: LiveVideoEventType = 'state-change'
-      this.liveVideosSocket.on(type, (payload: LiveVideoEventPayload) => this.dispatchLiveVideoEvent(type, payload))
-    })
+    const types: LiveVideoEventType[] = [ 'views-change', 'state-change' ]
+
+    for (const type of types) {
+      this.liveVideosSocket.on(type, (payload: LiveVideoEventPayload) => {
+        this.dispatchLiveVideoEvent(type, payload)
+      })
+    }
   }
 
   private async importIOIfNeeded () {
     if (this.io) return
 
-    this.io = (await import('socket.io-client') as any).default
+    this.io = (await import('socket.io-client')).io
   }
 
   private dispatchLiveVideoEvent (type: LiveVideoEventType, payload: LiveVideoEventPayload) {