juick-server: move websocket client to notifications server

4 files changed, 101 insertions, 3 deletions

diff --git a/juick-notifications/src/main/java/com/juick/components/configuration/JuickServerWebsocketConfiguration.java b/juick-notifications/src/main/java/com/juick/components/configuration/JuickServerWebsocketConfiguration.java
index e94a3a8e..79459d72 100644
--- a/juick-notifications/src/main/java/com/juick/components/configuration/JuickServerWebsocketConfiguration.java
+++ b/juick-notifications/src/main/java/com/juick/components/configuration/JuickServerWebsocketConfiguration.java
@@ -1,7 +1,7 @@
 package com.juick.components.configuration;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.juick.server.component.JuickServerComponent;
+import com.juick.components.service.JuickServerComponent;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsAppConfiguration.java b/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsAppConfiguration.java
index cb921fe5..5ccacf60 100644
--- a/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsAppConfiguration.java
+++ b/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsAppConfiguration.java
@@ -1,8 +1,8 @@
 package com.juick.components.configuration;
 
 import com.juick.components.Notifications;
-import com.juick.server.component.JuickServerComponent;
-import com.juick.server.component.JuickServerReconnectManager;
+import com.juick.components.service.JuickServerComponent;
+import com.juick.components.service.JuickServerReconnectManager;
 import com.juick.server.configuration.BaseWebConfiguration;
 import org.springframework.context.annotation.*;
 import org.springframework.scheduling.annotation.EnableScheduling;
diff --git a/juick-notifications/src/main/java/com/juick/components/service/JuickServerComponent.java b/juick-notifications/src/main/java/com/juick/components/service/JuickServerComponent.java
new file mode 100644
index 00000000..eecddc70
--- /dev/null
+++ b/juick-notifications/src/main/java/com/juick/components/service/JuickServerComponent.java
@@ -0,0 +1,75 @@
+package com.juick.components.service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.juick.server.component.DisconnectedEvent;
+import com.juick.server.component.MessageEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.PingMessage;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+import org.springframework.web.socket.handler.TextWebSocketHandler;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.inject.Inject;
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+@Component
+public class JuickServerComponent extends TextWebSocketHandler {
+    private static Logger logger = LoggerFactory.getLogger(JuickServerComponent.class);
+    @Inject
+    private ApplicationEventPublisher applicationEventPublisher;
+    @Inject
+    private ObjectMapper jsonMapper;
+
+    private WebSocketSession session;
+    private final AtomicBoolean closeFlag = new AtomicBoolean(false);
+
+    @PostConstruct
+    public void init() {
+        closeFlag.set(false);
+    }
+    @Override
+    public void afterConnectionEstablished(WebSocketSession session) throws Exception {
+        logger.info("WebSocket connected");
+        this.session = session;
+    }
+
+    @Override
+    public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
+        logger.info("WebSocket disconnected with code {}: {}", status.getCode(), status.getReason());
+        applicationEventPublisher.publishEvent(new DisconnectedEvent(this));
+    }
+
+    @Override
+    protected void handleTextMessage(WebSocketSession session, TextMessage text) throws Exception {
+        com.juick.Message jmsg = jsonMapper.readValue(text.asBytes(), com.juick.Message.class);
+
+        if (logger.isInfoEnabled()) // prevent writeValueAsString execution if logger disabled
+            logger.info("got jmsg: {}", jsonMapper.writeValueAsString(jmsg));
+        if (!closeFlag.get()) {
+            applicationEventPublisher.publishEvent(new MessageEvent(this, jmsg));
+        }
+    }
+
+    @Scheduled(fixedRate = 30000, initialDelay = 30000)
+    public void ping() throws IOException {
+        if (session != null && session.isOpen()) {
+            logger.debug("Sending WebSocket ping");
+            session.sendMessage(new PingMessage());
+        } else if (!closeFlag.get()) {
+            applicationEventPublisher.publishEvent(new DisconnectedEvent(this));
+        }
+    }
+    @PreDestroy
+    public void close() {
+        closeFlag.set(true);
+    }
+
+}
diff --git a/juick-notifications/src/main/java/com/juick/components/service/JuickServerReconnectManager.java b/juick-notifications/src/main/java/com/juick/components/service/JuickServerReconnectManager.java
new file mode 100644
index 00000000..f83a3aa0
--- /dev/null
+++ b/juick-notifications/src/main/java/com/juick/components/service/JuickServerReconnectManager.java
@@ -0,0 +1,23 @@
+package com.juick.components.service;
+
+import com.juick.server.component.DisconnectedEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.client.WebSocketConnectionManager;
+
+import javax.inject.Inject;
+
+@Component
+public class JuickServerReconnectManager implements ApplicationListener<DisconnectedEvent> {
+    private static Logger logger = LoggerFactory.getLogger(JuickServerReconnectManager.class);
+    @Inject
+    private WebSocketConnectionManager webSocketConnectionManager;
+    @Override
+    public void onApplicationEvent(DisconnectedEvent event) {
+        logger.info("retrying...");
+        webSocketConnectionManager.stop();
+        webSocketConnectionManager.start();
+    }
+}