(BROKEN) добавлен PingPacket

protocol/src/main/java/mc/protocol/State.java

@@ -6,6 +6,7 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import mc.protocol.packets.Packet;
 import mc.protocol.packets.PacketDirection;
+import mc.protocol.packets.PingPacket;
 import mc.protocol.packets.client.HandshakePacket;
 import mc.protocol.packets.client.LoginStartPacket;
 import mc.protocol.packets.client.StatusServerRequest;
@@ -23,9 +24,15 @@ public enum State {
 	),
 	STATUS(1,
 			// server bound
-			ImmutableBiMap.of(0x00, StatusServerRequest.class),
+			ImmutableBiMap.of(
+					0x00, StatusServerRequest.class,
+					0x01, PingPacket.class
+			),
 			// client bound
-			ImmutableBiMap.of(0x00, StatusServerResponse.class)
+			ImmutableBiMap.of(
+					0x00, StatusServerResponse.class,
+					0x01, PingPacket.class
+			)
 	),
 	LOGIN(2,
 			// server bound

protocol/src/main/java/mc/protocol/packets/PingPacket.java

@@ -0,0 +1,41 @@
+package mc.protocol.packets;
+
+import lombok.Data;
+import mc.protocol.io.NetByteBuf;
+
+/**
+ * Пинг-пакет.
+ *
+ * <p>Эхо-пакет, которым проверяется качество соединения между <b>Клиентом</b> и <b>Сервером</b>.</p>
+ *
+ * <p>По спецификации:</p>
+ * <oi>
+ *     <li>если <b>Сервер</b> не ответил <b>Клиенту</b> в течении 20 секунд, <b>Клиент</b> отключается
+ *     и выдаёт ошибку <i>"Timed out"</i>.</li>
+ *     <li>если <b>Клиент</b> не отвечает <b>Серверу</b> в течении 30 секунд, <b>Сервер</b> отключает <b>Клиента</b>.</li>
+ * </oi>
+ *
+ * <p>Структура пакета</p>
+ * <pre>
+ * | FIELD   | TYPE | NOTES                  |
+ * |---------|------|------------------------|
+ * | Payload | Long | Любое уникальное число |
+ * </pre>
+ *
+ * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=7368#Keep_Alive">Keep Alive</a>
+ */
+@Data
+public class PingPacket implements Packet {
+
+	private Long payload;
+
+	@Override
+	public void readSelf(NetByteBuf netByteBuf) {
+		payload = netByteBuf.readLong();
+	}
+
+	@Override
+	public void writeSelf(NetByteBuf netByteBuf) {
+		netByteBuf.writeLong(payload);
+	}
+}

protocol/src/main/java/mc/protocol/packets/client/LoginStartPacket.java

@@ -4,7 +4,6 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import mc.protocol.State;
 import mc.protocol.io.NetByteBuf;
 import mc.protocol.packets.Packet;
 
@@ -21,7 +20,6 @@ import mc.protocol.packets.Packet;
  * </pre>
  *
  * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=7368#Login_Start" target="_top">Login start</a>
- * @see State
  */
 @NoArgsConstructor
 @Getter

server/src/main/java/mc/server/di/NetworkModule.java

@@ -18,6 +18,7 @@ import mc.protocol.io.codec.ProtocolSplitter;
 import mc.server.network.Server;
 import mc.server.network.netty.handler.HandshakeHandler;
 import mc.server.network.netty.NettyServer;
+import mc.server.network.netty.handler.KeepAliveHandler;
 import mc.server.network.netty.handler.LoginHandler;
 import mc.server.network.netty.handler.StatusHandler;
 
@@ -59,7 +60,8 @@ public class NetworkModule {
 	@Provides
 	Map<String, ChannelHandler> provideChannelHandlerMap(
 			Provider<StatusHandler> statusHandlerProvider,
-			Provider<LoginHandler> loginHandlerProvider
+			Provider<LoginHandler> loginHandlerProvider,
+			Provider<KeepAliveHandler> keepAliveHandlerProvider
 	) {
 		Map<String, ChannelHandler> map = new LinkedHashMap<>();
 
@@ -67,7 +69,8 @@ public class NetworkModule {
 		map.put("protocol_splitter", new ProtocolSplitter());
 		map.put("protocol_decoder", new ProtocolDecoder(true));
 		map.put("protocol_encoder", new ProtocolEncoder());
-		map.put("handshake_handler", new HandshakeHandler(statusHandlerProvider, loginHandlerProvider));
+		map.put("handshake_handler", new HandshakeHandler(
+				statusHandlerProvider, loginHandlerProvider, keepAliveHandlerProvider));
 
 		return map;
 	}
@@ -81,4 +84,9 @@ public class NetworkModule {
 	LoginHandler provideLoginHandler() {
 		return new LoginHandler();
 	}
+
+	@Provides
+	KeepAliveHandler provideKeepAliveHandler() {
+		return new KeepAliveHandler();
+	}
 }

server/src/main/java/mc/server/network/netty/handler/HandshakeHandler.java

@@ -15,6 +15,7 @@ public class HandshakeHandler extends AbstractPacketHandler<HandshakePacket> {
 
 	private final Provider<StatusHandler> statusHandlerProvider;
 	private final Provider<LoginHandler> loginHandlerProvider;
+	private final Provider<KeepAliveHandler> keepAliveHandlerProvider;
 
 	@Override
 	protected void channelRead1(ChannelHandlerContext ctx, HandshakePacket packet) {
@@ -24,6 +25,7 @@ public class HandshakeHandler extends AbstractPacketHandler<HandshakePacket> {
 
 		if (State.STATUS == packet.getNextState()) {
 			ctx.pipeline().replace("handshake_handler", "status_handler", statusHandlerProvider.get());
+			ctx.pipeline().addAfter("status_handler", "keepalive_handler", keepAliveHandlerProvider.get());
 		} else if (State.LOGIN == packet.getNextState()) {
 			ctx.channel().pipeline().replace("handshake_handler", "login_handler", loginHandlerProvider.get());
 		}

server/src/main/java/mc/server/network/netty/handler/KeepAliveHandler.java

@@ -0,0 +1,16 @@
+package mc.server.network.netty.handler;
+
+import io.netty.channel.ChannelHandlerContext;
+import lombok.extern.slf4j.Slf4j;
+import mc.protocol.packets.PingPacket;
+
+@Slf4j
+public class KeepAliveHandler extends AbstractPacketHandler<PingPacket> {
+
+	@Override
+	protected void channelRead1(ChannelHandlerContext ctx, PingPacket packet) {
+		log.info("{}", packet);
+
+		ctx.writeAndFlush(packet).channel().disconnect();
+	}
+}

server/src/main/java/mc/server/network/netty/handler/StatusHandler.java

@@ -28,6 +28,6 @@ public class StatusHandler extends AbstractPacketHandler<StatusServerRequest> {
 				"  }\n" +
 				"}");
 
-		ctx.channel().writeAndFlush(response).channel().disconnect();
+		ctx.channel().writeAndFlush(response);
 	}
 }