Feat: Make connection data exposed in api less prone to throw errors (#…

…4604) * Feat: Make connection data exposed in api less prone to throw errors * address reviews * review
GeyserMC · May 10, 2024 · e697eb3 · e697eb3
1 parent 627c2ba
commit e697eb3
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 12 deletions.
diff --git a/api/src/main/java/org/geysermc/geyser/api/event/connection/ConnectionRequestEvent.java b/api/src/main/java/org/geysermc/geyser/api/event/connection/ConnectionRequestEvent.java
@@ -50,8 +50,9 @@ public ConnectionRequestEvent(@NonNull InetSocketAddress ip, @Nullable InetSocke
      * The IP address of the client attempting to connect
      *
      * @return the IP address of the client attempting to connect
+     * @deprecated Use {@link #inetSocketAddress()} instead
      */
-    @NonNull
+    @NonNull @Deprecated(forRemoval = true)
     public InetSocketAddress getInetSocketAddress() {
         return ip;
     }
@@ -60,12 +61,33 @@ public InetSocketAddress getInetSocketAddress() {
      * The IP address of the proxy handling the connection. It will return null if there is no proxy.
      *
      * @return the IP address of the proxy handling the connection
+     * @deprecated Use {@link #proxyIp()} instead
      */
-    @Nullable
+    @Nullable @Deprecated(forRemoval = true)
     public InetSocketAddress getProxyIp() {
         return proxyIp;
     }
 
+    /**
+     * The IP address of the client attempting to connect
+     *
+     * @return the IP address of the client attempting to connect
+     */
+    @NonNull
+    public InetSocketAddress inetSocketAddress() {
+        return ip;
+    }
+
+    /**
+     * The IP address of the proxy handling the connection. It will return null if there is no proxy.
+     *
+     * @return the IP address of the proxy handling the connection
+     */
+    @Nullable
+    public InetSocketAddress proxyIp() {
+        return proxyIp;
+    }
+
     /**
      * The cancel status of this event. If this event is cancelled, the connection will be rejected.
      *

diff --git a/core/src/main/java/org/geysermc/geyser/network/GeyserServerInitializer.java b/core/src/main/java/org/geysermc/geyser/network/GeyserServerInitializer.java
@@ -25,19 +25,15 @@
 
 package org.geysermc.geyser.network;
 
-import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.DefaultEventLoopGroup;
-import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.util.concurrent.DefaultThreadFactory;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.cloudburstmc.protocol.bedrock.BedrockPeer;
 import org.cloudburstmc.protocol.bedrock.BedrockServerSession;
 import org.cloudburstmc.protocol.bedrock.netty.codec.packet.BedrockPacketCodec;
 import org.cloudburstmc.protocol.bedrock.netty.initializer.BedrockServerInitializer;
 import org.geysermc.geyser.GeyserImpl;
-import org.geysermc.geyser.api.event.bedrock.SessionInitializeEvent;
 import org.geysermc.geyser.session.GeyserSession;
 
 import java.net.InetSocketAddress;
@@ -72,7 +68,6 @@ public void initSession(@NonNull BedrockServerSession bedrockServerSession) {
             channel.pipeline().addAfter(BedrockPacketCodec.NAME, InvalidPacketHandler.NAME, new InvalidPacketHandler(session));
 
             bedrockServerSession.setPacketHandler(new UpstreamPacketHandler(this.geyser, session));
-            this.geyser.eventBus().fire(new SessionInitializeEvent(session));
         } catch (Throwable e) {
             // Error must be caught or it will be swallowed
             this.geyser.getLogger().error("Error occurred while initializing player!", e);

diff --git a/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java b/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
@@ -54,6 +54,7 @@
 import org.cloudburstmc.protocol.common.util.Zlib;
 import org.geysermc.geyser.Constants;
 import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.api.event.bedrock.SessionInitializeEvent;
 import org.geysermc.geyser.api.network.AuthType;
 import org.geysermc.geyser.api.pack.PackCodec;
 import org.geysermc.geyser.api.pack.ResourcePack;
@@ -188,6 +189,9 @@ public PacketSignal handle(LoginPacket loginPacket) {
             return PacketSignal.HANDLED;
         }
 
+        // Fire SessionInitializeEvent here as we now know the client data
+        geyser.eventBus().fire(new SessionInitializeEvent(session));
+
         PlayStatusPacket playStatus = new PlayStatusPacket();
         playStatus.setStatus(PlayStatusPacket.Status.LOGIN_SUCCESS);
         session.sendUpstreamPacket(playStatus);

diff --git a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
@@ -1077,9 +1077,11 @@ public void disconnect(String reason) {
         if (!closed) {
             loggedIn = false;
 
-            // Fire SessionDisconnectEvent
             SessionDisconnectEvent disconnectEvent = new SessionDisconnectEvent(this, reason);
-            geyser.getEventBus().fire(disconnectEvent);
+            if (authData != null && clientData != null) { // can occur if player disconnects before Bedrock auth finishes
+                // Fire SessionDisconnectEvent
+                geyser.getEventBus().fire(disconnectEvent);
+            }
 
             // Disconnect downstream if necessary
             if (downstream != null) {
@@ -1404,7 +1406,7 @@ public void requestOffhandSwap() {
 
     @Override
     public String name() {
-        return null;
+        return playerEntity != null ? javaUsername() : bedrockUsername();
     }
 
     @Override
@@ -1941,12 +1943,12 @@ public float getEyeHeight() {
 
     @Override
     public @MonotonicNonNull String javaUsername() {
-        return playerEntity.getUsername();
+        return playerEntity != null ? playerEntity.getUsername() : null;
     }
 
     @Override
     public UUID javaUuid() {
-        return playerEntity.getUuid();
+        return playerEntity != null ? playerEntity.getUuid() : null ;
     }
 
     @Override