Merge remote-tracking branch 'origin/master'

Author: netbuffer

src/main/java/cn/netbuffer/springboot/websocket/demo/config/SpringWebSocketConfig.java

@@ -1,5 +1,6 @@
 package cn.netbuffer.springboot.websocket.demo.config;
 
+import cn.netbuffer.springboot.websocket.demo.websocket.handler.MessageHandler;
 import cn.netbuffer.springboot.websocket.demo.websocket.handler.TextHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
@@ -14,12 +15,18 @@ public class SpringWebSocketConfig implements WebSocketConfigurer {
 
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-        registry.addHandler(buildTextHandler(), "/ws").setAllowedOrigins("*");
+//        registry.addHandler(buildTextHandler(), "/ws").setAllowedOrigins("*");
+        registry.addHandler(buildMessageHandler(), "/ws").setAllowedOrigins("*");
     }
 
     @Bean
     public WebSocketHandler buildTextHandler() {
         return new TextHandler();
     }
 
+    @Bean
+    public WebSocketHandler buildMessageHandler() {
+        return new MessageHandler();
+    }
+
 }

src/main/java/cn/netbuffer/springboot/websocket/demo/websocket/handler/MessageHandler.java

@@ -0,0 +1,42 @@
+package cn.netbuffer.springboot.websocket.demo.websocket.handler;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.socket.*;
+import org.springframework.web.socket.handler.AbstractWebSocketHandler;
+
+@Slf4j
+public class MessageHandler extends AbstractWebSocketHandler {
+
+    @Override
+    public void afterConnectionEstablished(WebSocketSession session) throws Exception {
+        super.afterConnectionEstablished(session);
+        SessionManager.put(session.getId(), session);
+        log.info("session[{}] afterConnectionEstablished", session.getId());
+    }
+
+    @Override
+    public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
+        log.info("session[{}] afterConnectionClosed", session.getId());
+        SessionManager.remove(session.getId());
+    }
+
+    @Override
+    protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception {
+        log.info("session[{}] receive text message={}", session.getId(), message);
+    }
+
+    @Override
+    protected void handleBinaryMessage(WebSocketSession session, BinaryMessage message) throws Exception {
+        log.info("session[{}] receive binary message={} length={}", session.getId(), message, message.getPayloadLength());
+    }
+
+    @Override
+    protected void handlePongMessage(WebSocketSession session, PongMessage message) throws Exception {
+        log.info("session[{}] receive pong message={}", session.getId(), message);
+    }
+
+    @Override
+    public void handleTransportError(WebSocketSession session, Throwable exception) throws Exception {
+    }
+
+}

src/main/java/cn/netbuffer/springboot/websocket/demo/websocket/handler/TextHandler.java

@@ -9,12 +9,20 @@
 @Slf4j
 public class TextHandler extends TextWebSocketHandler {
 
+    private static final String HEARTBEAT_PING = "PING";
+    private static final String HEARTBEAT_PONG = "PONG";
+    private static final TextMessage HEARTBEAT_PONG_MESSAGE = new TextMessage(HEARTBEAT_PONG);
+
     @Override
     protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception {
         if (session.isOpen()) {
             log.info("receive websocket message：{} session:{}", message, session.getId());
-            TextMessage returnMessage = new TextMessage(message.getPayload() + " received at server");
-            session.sendMessage(returnMessage);
+            if (message.getPayload().equals(HEARTBEAT_PING)) {
+                session.sendMessage(HEARTBEAT_PONG_MESSAGE);
+            } else {
+                TextMessage returnMessage = new TextMessage(message.getPayload() + " received at server");
+                session.sendMessage(returnMessage);
+            }
         }
     }
 

src/main/resources/templates/index.html

@@ -6,8 +6,23 @@
     <link href="https://cdn.jsdelivr.net/gh/kognise/water.css@latest/dist/dark.min.css" rel="stylesheet"/>
 </head>
 <body>
-<div th:each="item,it : ${sessions}">
-    <div>index:<span th:text="${it.index}"></span></div>
-    <div>item:<span th:text="${item}"></span></div>
+<ul th:each="item,it : ${sessions}">
+<!--    <li>index:<span th:text="${it.index}"></span></li>-->
+    <li>会话:<span th:text="${item}"></span><button th:onclick="send_msg([[${item}]])">send</button></li>
+</ul>
+<script>
+    function send_msg(key) {
+        console.log("key:%o", key);
+        var msg = prompt("请输入消息内容");
+        fetch("/ws/" + key + "/send?msg=" + msg)
+            .then(function (response) {
+                return response;
+            })
+            .then(function (response) {
+                console.log(`send msg success`);
+                alert("send success");
+            });
+    }
+</script>
 </body>
 </html>