From 4e60bfc8df349b12e3df5548bdbf8c4e30b82de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Wed, 28 Aug 2019 16:45:40 +0200 Subject: [PATCH] Comply API changes & remove unused stuff --- src/app/console/console.component.ts | 19 ++++++++----------- src/app/message-types/console-messages.ts | 7 +------ src/app/message-types/dashboard-messages.ts | 8 -------- src/app/message-types/set-value-command.ts | 3 --- src/app/message-types/websocket-message.ts | 2 ++ src/app/services/config.service.base.ts | 4 ++-- src/app/services/config.service.ts | 4 ++-- src/app/services/websocket.service.ts | 10 ++++++++++ 8 files changed, 25 insertions(+), 32 deletions(-) delete mode 100644 src/app/message-types/dashboard-messages.ts delete mode 100644 src/app/message-types/set-value-command.ts diff --git a/src/app/console/console.component.ts b/src/app/console/console.component.ts index ba4f4b6..5c07a78 100644 --- a/src/app/console/console.component.ts +++ b/src/app/console/console.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Output, EventEmitter } from '@angular/core'; -import { WebSocketService } from '../services/websocket.service'; +import { WebSocketService, Intent } from '../services/websocket.service'; import { WebSocketMessage } from '../message-types/websocket-message'; import { ConsoleReadMessage, ConsoleWriteMessage } from '../message-types/console-messages'; @@ -28,22 +28,19 @@ export class ConsoleComponent implements OnInit { } readHandler(message: ConsoleReadMessage) { - this.sendContent(this.console_content); + this.webSocketService.send({ + 'key': 'console.read', + 'content': this.console_content, + 'intent': Intent.EVENT + }); } writeHandler(message: ConsoleWriteMessage) { - this.setContent(message.value); - this.contentChanged.next(message.value); + this.setContent(message.content); + this.contentChanged.next(message.content); } setContent(content: string) { this.console_content = content; } - - sendContent(content: string) { - this.webSocketService.send({ - 'key': 'console.content', - 'value': content - }); - } } diff --git a/src/app/message-types/console-messages.ts b/src/app/message-types/console-messages.ts index 37e3bc5..b34fce9 100644 --- a/src/app/message-types/console-messages.ts +++ b/src/app/message-types/console-messages.ts @@ -1,12 +1,7 @@ -import { SetValueCommand } from './set-value-command'; import { WebSocketMessage } from './websocket-message'; export interface ConsoleReadMessage extends WebSocketMessage {} export interface ConsoleWriteMessage extends WebSocketMessage { - value: string; + content: string; } - -export interface ConsoleLiveLogsMessage extends WebSocketMessage, SetValueCommand {} - -export interface ConsoleRewriteContentMessage extends WebSocketMessage, SetValueCommand {} diff --git a/src/app/message-types/dashboard-messages.ts b/src/app/message-types/dashboard-messages.ts deleted file mode 100644 index 66cd750..0000000 --- a/src/app/message-types/dashboard-messages.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { SetValueCommand } from './set-value-command'; -import { WebSocketMessage } from './websocket-message'; - -export interface LayoutMessage extends WebSocketMessage, SetValueCommand {} - -export interface HideMessagesMessage extends WebSocketMessage, SetValueCommand {} - -export interface TerminalMenuItemMessage extends WebSocketMessage, SetValueCommand {} diff --git a/src/app/message-types/set-value-command.ts b/src/app/message-types/set-value-command.ts deleted file mode 100644 index 2aead65..0000000 --- a/src/app/message-types/set-value-command.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface SetValueCommand { - value: T; -} diff --git a/src/app/message-types/websocket-message.ts b/src/app/message-types/websocket-message.ts index e5d931b..5f7358f 100644 --- a/src/app/message-types/websocket-message.ts +++ b/src/app/message-types/websocket-message.ts @@ -1,3 +1,5 @@ export interface WebSocketMessage { key: string; + scope?: string; + intent?: string; } diff --git a/src/app/services/config.service.base.ts b/src/app/services/config.service.base.ts index 74c1b80..b0e4d2f 100644 --- a/src/app/services/config.service.base.ts +++ b/src/app/services/config.service.base.ts @@ -27,10 +27,10 @@ export abstract class ConfigServiceBase { firstConfigs.push(config.pipe(take(requiredEmitCount))); }); - merge(...firstConfigs).subscribe(undefined, undefined, () => { + merge(...firstConfigs).subscribe({complete: () => { this.configDone.next(); this.configDone.complete(); - }); + }}); } subscribeConfigKeys() { diff --git a/src/app/services/config.service.ts b/src/app/services/config.service.ts index 561e798..30b638e 100644 --- a/src/app/services/config.service.ts +++ b/src/app/services/config.service.ts @@ -75,9 +75,9 @@ export class ConfigReadyService { recvdConfigDone.complete(); }); - merge(...this.readyNotifiers).subscribe(undefined, undefined, () => { + merge(...this.readyNotifiers).subscribe({complete: () => { this.configDone.next(); this.configDone.complete(); - }); + }}); } } diff --git a/src/app/services/websocket.service.ts b/src/app/services/websocket.service.ts index c67db46..ace7edf 100644 --- a/src/app/services/websocket.service.ts +++ b/src/app/services/websocket.service.ts @@ -4,6 +4,15 @@ import { webSocket, WebSocketSubject } from 'rxjs/webSocket'; import { filter, map } from 'rxjs/operators'; import { WebSocketMessage } from '../message-types/websocket-message'; +export enum Scope { + ZMQ = 'zmq', + WEBSOCKET = 'websocket' +} + +export enum Intent { + CONTROL = 'control', + EVENT = 'event' +} @Injectable() export class WebSocketService { @@ -22,6 +31,7 @@ export class WebSocketService { public observeKey(key: string): Observable { return this.ws.pipe( filter(message => message.key.startsWith(key)), + filter(message => message.intent !== Intent.EVENT), map(message => message) ); }