import { LiveVideoEventPayload, LiveVideoEventType, UserNotification as UserNotificationServer } from '@shared/models'
import { environment } from '../../../environments/environment'
import { AuthService } from '../auth'
+import { io, Socket } from 'socket.io-client'
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,
this.liveVideosSocket.emit('subscribe', { videoId })
}
- async unsubscribeLiveVideos (videoId: number) {
+ unsubscribeLiveVideos (videoId: number) {
if (!this.liveVideosSocket) return
this.liveVideosSocket.emit('unsubscribe', { videoId })
await this.importIOIfNeeded()
+ // Prevent protractor issues https://github.com/angular/angular/issues/11853
this.ngZone.runOutsideAngular(() => {
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.ngZone.run(() => this.dispatchNotificationEvent('new', n))
})
}
await this.importIOIfNeeded()
+ // Prevent protractor issues https://github.com/angular/angular/issues/11853
this.ngZone.runOutsideAngular(() => {
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.ngZone.run(() => 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) {