extend timeout

Author: USS-Shenzhou

src/main/java/cn/ussshenzhou/channel/subspace/client/SubspaceConnection.java

@@ -27,7 +27,6 @@ public class SubspaceConnection {
     private static Protocol protocol;
     private static SecurityLevel securityLevel;
     private static final EventLoopGroup EVENT_LOOP_GROUP = new MultiThreadIoEventLoopGroup(1, new DefaultThreadFactory("Channel-Client-Subspace", true), NioIoHandler.newFactory());
-    ;
     private static volatile Channel channel;
     private static volatile boolean activelyDisconnect;
     private static ScheduledFuture<?> reconnectFuture;
@@ -214,19 +213,19 @@ protected void initChannel(SocketChannel ch) {
                                 LogUtils.getLogger().info("Disconnected from subspace.");
                                 activelyDisconnect = false;
                             } else {
-                                LogUtils.getLogger().warn("Disconnected from subspace. Reconnecting in 10s...");
+                                LogUtils.getLogger().warn("Disconnected from subspace. Reconnecting in 30s...");
                                 MicrophoneHud.setStatus(MicrophoneHud.Status.SUBSPACE);
-                                reconnectFuture = EVENT_LOOP_GROUP.schedule(() -> connect(packet), 10, TimeUnit.SECONDS);
+                                reconnectFuture = EVENT_LOOP_GROUP.schedule(() -> connect(packet), 30, TimeUnit.SECONDS);
                             }
                             channel = null;
                         });
                         send(new HandshakePacket());
                         LogUtils.getLogger().info("Subspace connected. Sending HandshakePacket");
                         MicrophoneHud.resumeStatus();
                     } else {
-                        LogUtils.getLogger().error("Failed to connect to subspace server. Try again in 10s...");
+                        LogUtils.getLogger().error("Failed to connect to subspace server. Try again in 30s...");
                         MicrophoneHud.setStatus(MicrophoneHud.Status.SUBSPACE);
-                        reconnectFuture = EVENT_LOOP_GROUP.schedule(() -> connect(packet), 10, TimeUnit.SECONDS);
+                        reconnectFuture = EVENT_LOOP_GROUP.schedule(() -> connect(packet), 30, TimeUnit.SECONDS);
                         channel = null;
                     }
                 });

src/main/java/cn/ussshenzhou/channel/subspace/server/SubspaceConnection.java

@@ -74,8 +74,8 @@ protected void initChannel(SocketChannel ch) {
                                 LogUtils.getLogger().info("Disconnected from subspace.");
                                 activelyDisconnect = false;
                             } else {
-                                LogUtils.getLogger().warn("Disconnected from subspace. Reconnecting in 10s...");
-                                eventLoopGroup.schedule(SubspaceConnection::connect, 10, TimeUnit.SECONDS);
+                                LogUtils.getLogger().warn("Disconnected from subspace. Reconnecting in 30s...");
+                                eventLoopGroup.schedule(SubspaceConnection::connect, 30, TimeUnit.SECONDS);
                             }
                             channel = null;
                         });
@@ -85,8 +85,8 @@ protected void initChannel(SocketChannel ch) {
                             ServerLifecycleHooks.getCurrentServer().getPlayerList().getPlayers().forEach(SubspaceConnection::newPlayer);
                         }
                     } else {
-                        LogUtils.getLogger().error("Failed to connect to subspace server. Try again in 10s...");
-                        eventLoopGroup.schedule(SubspaceConnection::connect, 10, TimeUnit.SECONDS);
+                        LogUtils.getLogger().error("Failed to connect to subspace server. Try again in 30s...");
+                        eventLoopGroup.schedule(SubspaceConnection::connect, 30, TimeUnit.SECONDS);
                         channel = null;
                     }
                 });

subspace/src/network/ClientTcpConnection.cpp

@@ -49,7 +49,7 @@ namespace subspace {
         socket.set_option(asio::ip::tcp::no_delay(true));
         remoteAddress = socket.remote_endpoint().address().to_string() + ":" + std::to_string(socket.remote_endpoint().port());
         spdlog::info("Client connecting from {}", getRemoteAddress());
-        handshakeTimer.expires_after(std::chrono::seconds(5));
+        handshakeTimer.expires_after(std::chrono::seconds(10));
         handshakeTimer.async_wait([thiz = std::dynamic_pointer_cast<ClientTcpConnection>(shared_from_this())](const std::error_code& ec) {
             if (ec) {
                 return;

subspace/src/network/ServerConnection.cpp

@@ -12,7 +12,7 @@ namespace subspace {
         socket.set_option(asio::ip::tcp::no_delay(true));
         remoteAddress = socket.remote_endpoint().address().to_string() + ":" + std::to_string(socket.remote_endpoint().port());
         spdlog::info("Minecraft Server connecting, from {}", getRemoteAddress());
-        handshakeTimer.expires_from_now(std::chrono::seconds(3));
+        handshakeTimer.expires_from_now(std::chrono::seconds(10));
         handshakeTimer.async_wait([thiz = std::dynamic_pointer_cast<ServerConnection>(shared_from_this())](const std::error_code& ec) {
             if (ec) {
                 return;