mrtoth/frontend-tutorial-framework
1
0
Fork 0
mirror of https://github.com/avatao-content/frontend-tutorial-framework synced 2025-04-03 11:52:40 +00:00
Code Issues Releases Wiki Activity

Update WebSocketService according to the new API

Browse Source
This commit is contained in:
R. Richard 2019-08-07 10:25:09 +02:00
parent 116401fe80
commit 053b4816d1
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/message-types/websocket-message.ts
View File

@ -1,8 +1,6 @@
// Copyright (C) 2018 Avatao.com Innovative Learning Kft. // Copyright (C) 2018 Avatao.com Innovative Learning Kft.
// All Rights Reserved. See LICENSE file for details. // All Rights Reserved. See LICENSE file for details.
export class WebSocketMessage<T> { export interface WebSocketMessage {
key: string; key: string;
trigger?: string;
data: T;
} }

8
src/app/services/websocket.service.ts
View File

@ -19,7 +19,7 @@ function jsonWebsocketConnect(url: string, input: Observable<object>, protocols?
@Injectable() @Injectable()
export class WebSocketService { export class WebSocketService {
private uplink: QueueingSubject<object>; private uplink: QueueingSubject<object>;
public downlink: Observable<WebSocketMessage<undefined>>; public downlink: Observable<WebSocketMessage>;
constructor() {} constructor() {}
@ -33,14 +33,14 @@ export class WebSocketService {
wsproto + window.location.host + '/ws', wsproto + window.location.host + '/ws',
this.uplink = new QueueingSubject<object>() this.uplink = new QueueingSubject<object>()
).messages.pipe( ).messages.pipe(
map(message => <WebSocketMessage<undefined>> message), map(message => <WebSocketMessage> message),
share() share()
); );
console.log('ws connected'); console.log('ws connected');
} }
public observeKey<T>(key: string): Observable<WebSocketMessage<T>> { public observeKey<T extends WebSocketMessage>(key: string): Observable<T> {
return this.downlink.pipe(filter(message => message.key === key)); return this.downlink.pipe(filter(message => message.key.startsWith(key)), map(message => <T> message));
} }
public send(key: string, data?: any, trigger?: any): void { public send(key: string, data?: any, trigger?: any): void {