Merge branch 'feature/websockets' into feature/scene-triggers

dvdgeisler · Nov 24, 2022 · e60b7d0 · e60b7d0
2 parents 68e0fcf + 055189d
commit e60b7d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/dirigera-client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/http/ClientApi.java b/dirigera-client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/http/ClientApi.java
@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.net.URI;
 import java.util.Map;
+import java.util.function.Consumer;
 
 @Component
 public class ClientApi extends AbstractClientApi {
@@ -88,7 +89,7 @@ public Mono<Map> dump() {
                 .bodyToMono(Map.class);
     }
 
-    public void websocket() {
+    public void websocket(final Consumer<String> consumer) {
         final String token;
         final String authorizationHeader;
         final HttpClient httpClient;
@@ -103,10 +104,10 @@ public void websocket() {
                     .headers(headers -> headers.add(HttpHeaders.AUTHORIZATION, authorizationHeader))
                     .keepAlive(true);
             client = new ReactorNettyWebSocketClient(httpClient);
-            client.execute(URI.create(String.format("https://%s:%d/v1/", hostname, port)), session ->
+            client.execute(URI.create(String.format("https://%s:%d/v1/", this.hostname, this.port)), session ->
                     session.receive()
                             .map(WebSocketMessage::getPayloadAsText)
-                            .doOnNext(message -> log.debug("Received websocket message: {}", message))
+                            .doOnNext(consumer)
                             .repeat()
                             .then()
             ).block();

diff --git a/...mples/src/main/java/de/dvdgeisler/iot/dirigera/client/examples/websockets/WebSockets.java b/...mples/src/main/java/de/dvdgeisler/iot/dirigera/client/examples/websockets/WebSockets.java
@@ -9,10 +9,9 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import reactor.core.publisher.Flux;
 
 /**
- * Lists all known devices
+ * Opens a websocket
  */
 @SpringBootApplication
 @ComponentScan(basePackageClasses = {DirigeraApi.class})
@@ -25,7 +24,7 @@ public CommandLineRunner run(final DirigeraApi api, final ClientApi capi) {
         return (String... args) -> {
             api.pairIfRequired().block(); // pair gateway if required
 
-            capi.websocket();
+            capi.websocket(message -> log.debug("Received websocket message: {}", message));
         };
     }