Merge branch 'master' of github.com:mrniko/netty-socketio

mrniko · Jul 25, 2024 · 8efbe81 · 8efbe81
2 parents abc8b0b + bebdad6
commit 8efbe81
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 16 deletions.
diff --git a/src/main/java/com/corundumstudio/socketio/handler/ClientsBox.java b/src/main/java/com/corundumstudio/socketio/handler/ClientsBox.java
@@ -42,8 +42,8 @@ public void addClient(ClientHead clientHead) {
         uuid2clients.put(clientHead.getSessionId(), clientHead);
     }
 
-    public void removeClient(UUID sessionId) {
-        uuid2clients.remove(sessionId);
+    public ClientHead removeClient(UUID sessionId) {
+        return uuid2clients.remove(sessionId);
     }
 
     public ClientHead get(UUID sessionId) {

diff --git a/src/main/java/com/corundumstudio/socketio/transport/WebSocketTransport.java b/src/main/java/com/corundumstudio/socketio/transport/WebSocketTransport.java
@@ -153,31 +153,47 @@ private void handshake(ChannelHandlerContext ctx, final UUID sessionId, String p
                 new WebSocketServerHandshakerFactory(getWebSocketLocation(req), null, true, configuration.getMaxFramePayloadLength());
         WebSocketServerHandshaker handshaker = factory.newHandshaker(req);
         if (handshaker != null) {
-            ChannelFuture f = handshaker.handshake(channel, req);
-            f.addListener(new ChannelFutureListener() {
-                @Override
-                public void operationComplete(ChannelFuture future) throws Exception {
-                    if (!future.isSuccess()) {
-                        log.error("Can't handshake " + sessionId, future.cause());
-                        return;
+            try {
+                ChannelFuture f = handshaker.handshake(channel, req);
+                f.addListener(new ChannelFutureListener() {
+                    @Override
+                    public void operationComplete(ChannelFuture future) throws Exception {
+                        if (!future.isSuccess()) {
+                            log.error("Can't handshake {}", sessionId, future.cause());
+                            closeClient(sessionId, channel);
+                            return;
+                        }
+                        channel.pipeline().addBefore(SocketIOChannelInitializer.WEB_SOCKET_TRANSPORT, SocketIOChannelInitializer.WEB_SOCKET_AGGREGATOR,
+                                new WebSocketFrameAggregator(configuration.getMaxFramePayloadLength()));
+                        connectClient(channel, sessionId);
                     }
-
-                    channel.pipeline().addBefore(SocketIOChannelInitializer.WEB_SOCKET_TRANSPORT, SocketIOChannelInitializer.WEB_SOCKET_AGGREGATOR,
-                            new WebSocketFrameAggregator(configuration.getMaxFramePayloadLength()));
-                    connectClient(channel, sessionId);
-                }
-            });
+                });
+            } catch (Throwable e) {
+                log.warn("Can't handshake {}, {}", sessionId, e.getMessage(), e);
+                closeClient(sessionId, channel);
+            }
         } else {
             WebSocketServerHandshakerFactory.sendUnsupportedVersionResponse(ctx.channel());
         }
     }
 
+    private void closeClient(UUID sessionId, Channel channel) {
+        try {
+            channel.close();
+        } catch (Throwable t) {
+            log.warn("Can't close channel for sessionId: {}", sessionId, t);
+        }
+        ClientHead clientHead = clientsBox.removeClient(sessionId);
+        clientHead.disconnect();
+        log.info("Client with sessionId: {} was disconnected", sessionId);
+    }
+
     private void connectClient(final Channel channel, final UUID sessionId) {
         ClientHead client = clientsBox.get(sessionId);
         if (client == null) {
             log.warn("Unauthorized client with sessionId: {} with ip: {}. Channel closed!",
                         sessionId, channel.remoteAddress());
-            channel.close();
+            closeClient(sessionId, channel);
             return;
         }