From 8d2f19f0625648a3727bbb71c6ee5a8c659ce601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Wed, 21 Feb 2018 15:32:24 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Rename=20anchor=20->=20key=20globally=20?= =?UTF-8?q?=C2=AF\=5F(=E3=83=84)=5F/=C2=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/messages/messages.component.ts | 2 +- src/app/services/fsmupdate.service.ts | 2 +- src/app/services/websocket.service.ts | 8 ++++---- src/app/services/wsmessage.ts | 2 +- src/app/webide/webide.component.ts | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/app/messages/messages.component.ts b/src/app/messages/messages.component.ts index 4649205..acadec0 100644 --- a/src/app/messages/messages.component.ts +++ b/src/app/messages/messages.component.ts @@ -23,7 +23,7 @@ export class MessagesComponent implements OnInit { ngOnInit() { this.websocketService.connect(); - this.websocketService.observeAnchor('message').subscribe( + this.websocketService.observeKey('message').subscribe( (event) => { this.messages.push(event.data); event.data.message = this.convert(event.data.message); diff --git a/src/app/services/fsmupdate.service.ts b/src/app/services/fsmupdate.service.ts index 6423ca5..eabd14d 100644 --- a/src/app/services/fsmupdate.service.ts +++ b/src/app/services/fsmupdate.service.ts @@ -11,7 +11,7 @@ export class FSMUpdateService { constructor(private websocketService: WebSocketService) {} public init(): void { - this.websocketService.observeAnchor('FSMUpdate').subscribe((event) => { + this.websocketService.observeKey('FSMUpdate').subscribe((event) => { this.current_state = event.data.current_state; this.valid_transitions = event.data.valid_transitions; }); diff --git a/src/app/services/websocket.service.ts b/src/app/services/websocket.service.ts index b9b0b3f..ef7eab4 100644 --- a/src/app/services/websocket.service.ts +++ b/src/app/services/websocket.service.ts @@ -41,17 +41,17 @@ export class WebSocketService { console.log('ws connected'); } - public observeAnchor(anchor: string): Observable> { - return this.downlink.pipe(filter(message => message.anchor === anchor)); + public observeKey(key: string): Observable> { + return this.downlink.pipe(filter(message => message.key === key)); } - public send(anchor: string, data: any): void { + public send(key: string, data: any): void { // If the WebSocket is not connected then the QueueingSubject will ensure // that messages are queued and delivered when the WebSocket reconnects. // A regular Subject can be used to discard messages sent when the WebSocket // is disconnected. this.uplink.next({ - 'anchor': anchor, + 'key': key, 'data': data }); } diff --git a/src/app/services/wsmessage.ts b/src/app/services/wsmessage.ts index 6326d5d..22f20eb 100644 --- a/src/app/services/wsmessage.ts +++ b/src/app/services/wsmessage.ts @@ -1,4 +1,4 @@ export class WSMessage { - anchor: string; + key: string; data: T; // TODO: sane annotation } diff --git a/src/app/webide/webide.component.ts b/src/app/webide/webide.component.ts index 7509f20..b4d542e 100644 --- a/src/app/webide/webide.component.ts +++ b/src/app/webide/webide.component.ts @@ -25,7 +25,7 @@ const defaultSourceCode = `alert( 'Hello, world!' );`; styleUrls: ['./webide.component.scss'] }) export class WebideComponent implements OnInit { - anchor_id = 'anchor_webide'; + key_id = 'webide'; filename = 'demo.js'; code: string = defaultSourceCode; language = 'javascript'; @@ -47,7 +47,7 @@ export class WebideComponent implements OnInit { } subscribeWS() { - this.webSocketService.observeAnchor(this.anchor_id).subscribe((event) => { + this.webSocketService.observeKey(this.key_id).subscribe((event) => { this.command_handlers[event.data.command](event.data); this.changeDetectorRef.detectChanges(); }); @@ -81,7 +81,7 @@ export class WebideComponent implements OnInit { } sendCode() { - this.webSocketService.send(this.anchor_id, { + this.webSocketService.send(this.key_id, { 'command': 'write', 'content': this.code }); @@ -89,13 +89,13 @@ export class WebideComponent implements OnInit { } requestCode() { - this.webSocketService.send(this.anchor_id, { + this.webSocketService.send(this.key_id, { 'command': 'read' }); } selectCode(filename: string) { - this.webSocketService.send(this.anchor_id, { + this.webSocketService.send(this.key_id, { 'command': 'select', 'filename': filename }); From 477ea8b03a465c2612f02c1a31c1cce05597b613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Fri, 23 Feb 2018 08:33:35 +0100 Subject: [PATCH 2/3] Remove empty ctor body --- src/app/services/websocket.service.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/services/websocket.service.ts b/src/app/services/websocket.service.ts index ef7eab4..cadba56 100644 --- a/src/app/services/websocket.service.ts +++ b/src/app/services/websocket.service.ts @@ -18,9 +18,7 @@ export class WebSocketService { private uplink: QueueingSubject; public downlink: Observable>; - constructor() { - - } + constructor() {} public connect() { if (this.downlink) { From 6bdc3061cc36a33dff80f7b3006732ea782db8d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Fri, 23 Feb 2018 14:42:58 +0100 Subject: [PATCH 3/3] Add 'trigger' attribute to WSMessage --- src/app/services/wsmessage.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/services/wsmessage.ts b/src/app/services/wsmessage.ts index 22f20eb..1fceb3c 100644 --- a/src/app/services/wsmessage.ts +++ b/src/app/services/wsmessage.ts @@ -1,4 +1,5 @@ export class WSMessage { key: string; + trigger?: string; data: T; // TODO: sane annotation }